diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest index be2e4c2..abd4652 100644 --- a/dev-libs/pigpio/Manifest +++ b/dev-libs/pigpio/Manifest @@ -1,6 +1,4 @@ AUX pigpio-44-MakeRemote.patch 813 BLAKE2B 65730fabed5016f9c93193417e90683292171ab7b6cac46bd9eeb4ef550115bfd8de3f549d4aa06e09cf942eb887ddda59901806e914b2ed3d6523c353d7b2e7 SHA512 fcc6c3a27f889b688928c3c65683c91b449eff3de692fed33f1465f97ff7c30844a5927dfef96225034831a4a3512f245292ce1efe5fac6c3f7f2472a7987cd8 -AUX pigpio-44-Makefile.patch 1333 BLAKE2B e51f09f8c39538f2db907fcc720c7a2132df749c496a5a200c282cd8c52a0a8270f63ce766eae805d2fb311b144f71b1eac0b387d2c6441e85cceb3e03b399d8 SHA512 ac1a299bfcce2325ceb01c803d93fae3da6c7daa1d6efd8878defe6c12ca493fea16d484434af6eb0eda8049033ad2631f9a5100026af4204274e877e7327696 -AUX pigpio-44-format-security.patch 511 BLAKE2B db08ba7571fef037c50ed8287f7f4d96753ea328c44a00ce452f65d6d13ea61231d0ce31ae860bff12e408c04085fae0b49ea102795f9c9d991ac49ad9d53fd5 SHA512 02f025ca0c24fa08a52bc084c2c72c0a3a41ebc13299574e7de65ab81c0abb888d460dbac7592a856bc40110094a9bcf06072a0c5adb471dee28581bd08c2dd9 -AUX pigpio-9999-Makefile.patch 1404 BLAKE2B f6d126764639ec98e1c289961b16a5e4f3df9a8f704f9de5b5dada916cc6e18fc16d714128e04639d8f7bf98b7f0f65da0f4f3ea41affd2bbbd30c16824dce76 SHA512 7fb0c8e622dc7d01e9426fbb0d7e12e797cea3997726873636381f48b5ffc0754896eb94feb727084bc1d0087511c7096cbe9e189d658a4c33c9f2af56f2f402 +AUX pigpio-9999-Makefile.patch 1962 BLAKE2B 73833ae5cfaeeaed28bf62073b11f6c0b88d1487f02c1010b9459926aaa911bd785a4517738f2441afebc22331469c7878460bf27b3ea5b900b8a4ecbba98dd6 SHA512 a181163ca0848766f1eee96cc3408d0f227f0281f8f1efb0d7530dbed2b5b42b94ce76e3b9bcfccb2c85e6c3bfc6f2048403a9ccaee45a0653ef52608a1234f3 EBUILD pigpio-9999.ebuild 1532 BLAKE2B ef653624fb92209d667616918c8644bba34e45c52bc74ebcebf91a27462192124e394b7bb2ad902dbcefc7ad0dd1df2af9e530fac3e35087757cb4b4efac6667 SHA512 df7c1416458eabf431ca70f26eb1b951505ccd1b880b2873b1045f16b1012bf909aed63e3274b87544edbccc5ab2690bdd640ff999889c392cdfff879dcdce03 MISC metadata.xml 297 BLAKE2B b97ca67fe97dad72b5e8a79755f3888c8c48bd22a0766607b4b09859dcae7cebedcb33e02c5231025ac8e45506c195750e6eb8cfbbb5908ed94979c1ef194b4f SHA512 9284ce2486abe9a813147f1fc1d395fffd5f20f652281077ff39c823eb10a317fe5dd14413e39f3a6d25b8814535482105fcba8ba6af0988a2141e403d3b3d8b diff --git a/dev-libs/pigpio/files/pigpio-44-Makefile.patch b/dev-libs/pigpio/files/pigpio-44-Makefile.patch deleted file mode 100644 index 2bc2949..0000000 --- a/dev-libs/pigpio/files/pigpio-44-Makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- pigpio-44/Makefile -+++ pigpio-44/Makefile -@@ -1,10 +1,4 @@ - # --CC = gcc --AR = ar --RANLIB = ranlib --SIZE = size --SHLIB = gcc -shared --STRIPLIB = strip --strip-unneeded - - CFLAGS += -O3 -Wall -pthread - -@@ -32,7 +26,7 @@ - bindir = $(exec_prefix)/bin - includedir = $(prefix)/include - libdir = $(prefix)/lib --mandir = $(prefix)/man -+mandir = $(prefix)/share/man - - all: $(ALL) - -@@ -80,16 +74,13 @@ - install -m 0755 libpigpiod_if.so $(DESTDIR)$(libdir) - install -m 0755 libpigpiod_if2.so $(DESTDIR)$(libdir) - install -m 0755 -d $(DESTDIR)$(bindir) -- install -m 0755 -s pig2vcd $(DESTDIR)$(bindir) -- install -m 0755 -s pigpiod $(DESTDIR)$(bindir) -- install -m 0755 -s pigs $(DESTDIR)$(bindir) -- if which python2; then python2 setup.py install; fi -- if which python3; then python3 setup.py install; fi -+ install -m 0755 pig2vcd $(DESTDIR)$(bindir) -+ install -m 0755 pigpiod $(DESTDIR)$(bindir) -+ install -m 0755 pigs $(DESTDIR)$(bindir) - install -m 0755 -d $(DESTDIR)$(mandir)/man1 - install -m 0644 *.1 $(DESTDIR)$(mandir)/man1 - install -m 0755 -d $(DESTDIR)$(mandir)/man3 - install -m 0644 *.3 $(DESTDIR)$(mandir)/man3 -- ldconfig - - uninstall: - rm -f $(DESTDIR)$(includedir)/pigpio.h diff --git a/dev-libs/pigpio/files/pigpio-44-format-security.patch b/dev-libs/pigpio/files/pigpio-44-format-security.patch deleted file mode 100644 index ae5dab6..0000000 --- a/dev-libs/pigpio/files/pigpio-44-format-security.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pigpio-44/pigpio.c -+++ pigpio-44/pigpio.c -@@ -6269,7 +6269,7 @@ - tp->id, - (unsigned)tp->nextTick.tv_sec, - (unsigned)tp->nextTick.tv_nsec); -- fprintf(stderr, buf); -+ fprintf(stderr, "%s", buf); - } - } - -@@ -6360,7 +6360,7 @@ - break; - - case 5: -- fprintf(outFifo, cmdUsage); -+ fprintf(outFifo, "%s", cmdUsage); - break; - - case 6: diff --git a/dev-libs/pigpio/files/pigpio-9999-Makefile.patch b/dev-libs/pigpio/files/pigpio-9999-Makefile.patch index da455a6..b812fd0 100644 --- a/dev-libs/pigpio/files/pigpio-9999-Makefile.patch +++ b/dev-libs/pigpio/files/pigpio-9999-Makefile.patch @@ -1,6 +1,6 @@ diff -ur pigpio-9999.orig/Makefile pigpio-9999/Makefile ---- pigpio-9999.orig/Makefile 2016-11-04 10:17:06.305474989 +0100 -+++ pigpio-9999/Makefile 2016-11-04 10:19:41.936609643 +0100 +--- pigpio-9999.orig/Makefile 2019-03-05 12:26:57.330266931 +0100 ++++ pigpio-9999/Makefile 2019-03-05 17:15:42.301814015 +0100 @@ -1,15 +1,6 @@ # # Set CROSS_PREFIX to prepend to all compiler tools at once for easier @@ -14,10 +14,10 @@ diff -ur pigpio-9999.orig/Makefile pigpio-9999/Makefile -SHLIB = $(CC) -shared -STRIPLIB = $(STRIP) --strip-unneeded - - CFLAGS += -O3 -Wall -pthread + SOVERSION = 1 - LIB1 = libpigpio.so -@@ -36,7 +27,7 @@ + CFLAGS += -O3 -Wall -pthread +@@ -38,7 +29,7 @@ bindir = $(exec_prefix)/bin includedir = $(prefix)/include libdir = $(prefix)/lib @@ -26,17 +26,21 @@ diff -ur pigpio-9999.orig/Makefile pigpio-9999/Makefile all: $(ALL) -@@ -90,13 +81,10 @@ - install -m 0755 pig2vcd $(DESTDIR)$(bindir) - install -m 0755 pigpiod $(DESTDIR)$(bindir) - install -m 0755 pigs $(DESTDIR)$(bindir) -- if which python2; then python2 setup.py install; fi -- if which python3; then python3 setup.py install; fi - install -m 0755 -d $(DESTDIR)$(mandir)/man1 - install -m 0644 *.1 $(DESTDIR)$(mandir)/man1 - install -m 0755 -d $(DESTDIR)$(mandir)/man3 - install -m 0644 *.3 $(DESTDIR)$(mandir)/man3 -- ldconfig - - uninstall: - rm -f $(DESTDIR)$(includedir)/pigpio.h +@@ -103,8 +94,6 @@ + install -m 0755 pig2vcd $(DESTDIR)$(bindir) + install -m 0755 pigpiod $(DESTDIR)$(bindir) + install -m 0755 pigs $(DESTDIR)$(bindir) +- if which python2; then python2 setup.py install $(PYINSTALLARGS); fi +- if which python3; then python3 setup.py install $(PYINSTALLARGS); fi + install -m 0755 -d $(DESTDIR)$(mandir)/man1 + install -m 0644 *.1 $(DESTDIR)$(mandir)/man1 + install -m 0755 -d $(DESTDIR)$(mandir)/man3 +@@ -126,8 +115,6 @@ + rm -f $(DESTDIR)$(bindir)/pig2vcd + rm -f $(DESTDIR)$(bindir)/pigpiod + rm -f $(DESTDIR)$(bindir)/pigs +- if which python2; then python2 setup.py install $(PYINSTALLARGS) --record /tmp/pigpio >/dev/null; sed 's!^!$(DESTDIR)!' < /tmp/pigpio | xargs rm -f >/dev/null; fi +- if which python3; then python3 setup.py install $(PYINSTALLARGS) --record /tmp/pigpio >/dev/null; sed 's!^!$(DESTDIR)!' < /tmp/pigpio | xargs rm -f >/dev/null; fi + rm -f $(DESTDIR)$(mandir)/man1/pig*.1 + rm -f $(DESTDIR)$(mandir)/man1/libpigpio*.1 + rm -f $(DESTDIR)$(mandir)/man3/pig*.3