December 2019 - crux-commits

ports/contrib (3.5): obs-studio: 24.0.3 -> 24.0.4
by crux＠crux.nu 09 Dec '19

09 Dec '19

commit 09677aba45ae19ac332eff2f3f67ea96e42ff3dc Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Mon Dec 9 12:58:32 2019 +1100 obs-studio: 24.0.3 -> 24.0.4 diff --git a/obs-studio/.footprint b/obs-studio/.footprint index 8fb26bc53..611e47a5a 100644 --- a/obs-studio/.footprint +++ b/obs-studio/.footprint @@ -266,8 +266,8 @@ drwxr-xr-x root/root usr/share/obs/obs-plugins/obs-x264/locale/ drwxr-xr-x root/root usr/share/obs/obs-plugins/rtmp-services/ drwxr-xr-x root/root usr/share/obs/obs-plugins/rtmp-services/locale/ -rw-r--r-- root/root usr/share/obs/obs-plugins/rtmp-services/locale/en-US.ini --rw-r--r-- root/root usr/share/obs/obs-plugins/rtmp-services/package.json --rw-r--r-- root/root usr/share/obs/obs-plugins/rtmp-services/services.json +-rwxr-xr-x root/root usr/share/obs/obs-plugins/rtmp-services/package.json +-rwxr-xr-x root/root usr/share/obs/obs-plugins/rtmp-services/services.json drwxr-xr-x root/root usr/share/obs/obs-plugins/text-freetype2/ drwxr-xr-x root/root usr/share/obs/obs-plugins/text-freetype2/locale/ -rw-r--r-- root/root usr/share/obs/obs-plugins/text-freetype2/locale/en-US.ini diff --git a/obs-studio/.signature b/obs-studio/.signature index 9eaa3d3b8..7b15897ec 100644 --- a/obs-studio/.signature +++ b/obs-studio/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF342dvhsRB8epMf/CUO6oBBVd7Cdb0bC7gGbYcD3N8PTr2urJs5cQX8SBwBT2RrN0LNkoNlCHXuhE7uc7lom9jgQ= -SHA256 (Pkgfile) = 034d37d06f2106ccd1bfdaf562b8c4b5ca9a00d5e7f3db1439a11b2ae0595ac1 -SHA256 (.footprint) = 4221803ed072ab0dad610b67039d79d914a458e02bd026fc0bd302163d6aa00d -SHA256 (obs-studio-24.0.3.tar.gz) = 19f59b5a58e2158a93fe425e236c2d535afcbfd6b1d4c881cd1d8023a7e3c474 +RWSagIOpLGJF35+6JM0FPJUsaHo3gZOZ2B181sIjWrv14RTYVXb5aPrJ+hclH6xyNHatKnhiIUTSyvB8pQOHoGvXkE/Hzntj9Qk= +SHA256 (Pkgfile) = 2e6282b2b6c9ce3fbdb88fe9d901a35f8b89f509899a2d4d265cab7502dcca93 +SHA256 (.footprint) = 332f439eae0c0e3044cdda1e93f5d4a5001a27b3872efd8b4590c108e015ca01 +SHA256 (obs-studio-24.0.4.tar.gz) = a5e650a2fb3d20c583988cd51d657dc69f6ea5d4995908a61a7aaef0ae3c1e23 diff --git a/obs-studio/Pkgfile b/obs-studio/Pkgfile index 80c6260c4..525f67e5f 100644 --- a/obs-studio/Pkgfile +++ b/obs-studio/Pkgfile @@ -5,7 +5,7 @@ # Optional: jack-audio-connection-kit ffnvcodec-headers vlc luajit speexdsp x265 pulseaudio name=obs-studio -version=24.0.3 +version=24.0.4 release=1 source=(https://github.com/obsproject/$name/archive/$version/$name-$version…

1 0

ports/contrib (3.5): i3status-rust: 0.11.0 -> 0.12.0
by crux＠crux.nu 09 Dec '19

09 Dec '19

commit 1439ef50546a22df743ae25c4cb6e1ba5939940d Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Dec 9 01:07:09 2019 +0100 i3status-rust: 0.11.0 -> 0.12.0 diff --git a/i3status-rust/.signature b/i3status-rust/.signature index 2e2a6ef3e..dfba1d739 100644 --- a/i3status-rust/.signature +++ b/i3status-rust/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32pHwLZIt8pkFb16/wAAT1uU+zaEoz3105b+jGZGAYFCr+RhVq5QTTHcQFP28w6eZCT8fbzIZ2GPtSgzgUl1+A0= -SHA256 (Pkgfile) = b0054c9a69b77935d868d678a7f6888c79197f63c625b89fed81ca0eda7721e6 +RWSagIOpLGJF3/a2928Gd74esDxIIoBKX4SmvjoDRBy4Tg5vibzP3Xxxed6Stn8Py//HsDAGGVYMiucBCaIH3/MhUq8qdH+byA4= +SHA256 (Pkgfile) = b9d60c6b82ad9a580641501caea4323f9efc4759f4a2083771b9d600f198f5b4 SHA256 (.footprint) = 46e38c743630719fc5db8383d793d119a83726afb7568114366b2b9c2d3ed80b -SHA256 (i3status-rust-0.11.0.tar.gz) = 2f749ba4646e2fc0af62d31c990ae8d59d454eb0e5fe947b39d64cfeabbb0a1c +SHA256 (i3status-rust-0.12.0.tar.gz) = dbb0bb748c293c79e9b6936e437c0b6186572cbdaa4b64eae390d1069c351786 diff --git a/i3status-rust/Pkgfile b/i3status-rust/Pkgfile index 851120271..ea9cad26a 100644 --- a/i3status-rust/Pkgfile +++ b/i3status-rust/Pkgfile @@ -4,7 +4,7 @@ # Depends on: dbus flac libogg libsndfile libvorbis pulseaudio rust name=i3status-rust -version=0.11.0 +version=0.12.0 release=1 source=(https://github.com/greshake/i3status-rust/archive/v$version/$name-$…

1 0

ports/opt (3.5): cups-filters: remove '-w' gcc option because it might break stuff
by crux＠crux.nu 08 Dec '19

08 Dec '19

commit 09802fb70f16a4c00d7851f124fc039d2de947e0 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Dec 8 15:02:10 2019 +0100 cups-filters: remove '-w' gcc option because it might break stuff diff --git a/cups-filters/.signature b/cups-filters/.signature index fcfcf6af9..b66ee4f1f 100644 --- a/cups-filters/.signature +++ b/cups-filters/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/e6zi8KW9FyTS3W/mP7fiBHorjdUOWMnv5fEURGXteebvucSGAerYUQiX4CzScZUtLLmpsbKbjKd1B5nZw41iw0= -SHA256 (Pkgfile) = 7004411379e37701d250b92d415510f33707f9d93ae7730a2531d5c393e79278 +RWSE3ohX2g5d/RCQ00nJ2pFvajq4zvG3IAtVd53+xXDDr8+DSKdLkgk4cVeEH+Pytd21Ut4rDgg+I3WQipqr0f1WQwAbnf9TnQM= +SHA256 (Pkgfile) = 9e23a441c052a3f3e7220acba57f10d8c5606149ddaa7c4e5b10d726c35bb4f6 SHA256 (.footprint) = 57a65621a531177c2925ca3ba37032a5b8428f59f1755450f040260bab290ab8 SHA256 (cups-filters-1.25.13.tar.xz) = 5272ed6c58c3291527c6d0dacb719a253b621fc0e9462be8dfdf9b7bcd3d6bfc SHA256 (cups-browsed) = 4c4900ee88d488078da20a5cabc949921382fa69bc28bb2a7f89fa5ae01afb5b diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 90b14dca5..07c26bd9b 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -21,7 +21,7 @@ build () { --without-rcdir \ --with-browseremoteprotocols=cups - make CFLAGS+="-w" CPPFLAGS+="-w" + make make DESTDIR=$PKG install install -D -m 0755 $SRC/cups-browsed $PKG/etc/rc.d/cups-browsed

1 0

ports/opt (3.5): mod_php: add libpcre2 to dependencies
by crux＠crux.nu 08 Dec '19

08 Dec '19

commit 68f50b907d0d46ffc7f67ad521d19e291e4b5df2 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Dec 8 14:59:58 2019 +0100 mod_php: add libpcre2 to dependencies diff --git a/mod_php/Pkgfile b/mod_php/Pkgfile index eea311505..c0fade902 100644 --- a/mod_php/Pkgfile +++ b/mod_php/Pkgfile @@ -1,7 +1,7 @@ # Description: PHP DSO module for apache # URL: http://www.php.net # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: apache +# Depends on: apache libpcre2 name=mod_php version=7.3.12

1 0

ports/opt (3.5): lsscsi: 0.28 -> 0.30
by crux＠crux.nu 08 Dec '19

08 Dec '19

commit ef1edb0e4615eedec27460f8df6c7d90c09f66ce Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Mon Dec 9 00:47:40 2019 +1100 lsscsi: 0.28 -> 0.30 diff --git a/lsscsi/.signature b/lsscsi/.signature index 58f495a3e..657af06a1 100644 --- a/lsscsi/.signature +++ b/lsscsi/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cwL2nMPkfy9LscLnpUiT0Ez9+K2duRVNXMuguWxALp0au5c68G2VuTy4IiRe7eUxdjQMH95ZHikptPa8mtE4Q4= -SHA256 (Pkgfile) = dfa0a3908768698a532fdf888fe22f29effa304e6b73f2957b81b57b9b9648ff +RWSE3ohX2g5d/fiYzyYxXUh8b5ZwxAKMsF70VAv3JRD4KEuxPZmVSqsVf7+tbidYPPftbpgCDyebD45oPbhtxXyYLTjFUaKvwQo= +SHA256 (Pkgfile) = 11a13e6d2ae40a5fc899226da91ffc0a8239cd740b429c252ed6cb5494a2f8fa SHA256 (.footprint) = 2e3d27e382f647d0a13bf90df8cac8c97b8d27f4dfe260a95f95f625349270cd -SHA256 (lsscsi-0.28.tgz) = 025d009a1af42bc5b2fca664c44c9ecdfd754356e4a44f5c6aced2420afadd50 +SHA256 (lsscsi-0.30.tgz) = 619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15 diff --git a/lsscsi/Pkgfile b/lsscsi/Pkgfile index d9e942d8f..c11c55a05 100644 --- a/lsscsi/Pkgfile +++ b/lsscsi/Pkgfile @@ -1,15 +1,14 @@ # Description: list information about SCSI devices # URL: http://sg.danny.cz/scsi/lsscsi.html # Maintainer: Thomas Penteker, tek at serverop dot de -# Depends on: name=lsscsi -version=0.28 +version=0.30 release=1 source=(http://sg.danny.cz/scsi/lsscsi-$version.tgz) build() { - cd $name-$version + cd $name-* ./configure --prefix=/usr

1 0

ports/core (3.5): libcap: explicit disable go stuff
by crux＠crux.nu 08 Dec '19

08 Dec '19

commit a42965ae6ddde062bae1658bc39c4bb18992a767 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Dec 8 14:29:49 2019 +0100 libcap: explicit disable go stuff diff --git a/libcap/.signature b/libcap/.signature index 4aa711c0..27f36418 100644 --- a/libcap/.signature +++ b/libcap/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqrGuDEdaluid+G3qkmZ3nAzxoj/kpjsxRu5x8/UqUEpD5J8yD74UN9I0WSRAPtBFfa0RwZRB4NMBHg+XJK4+Qgc= -SHA256 (Pkgfile) = f4ba803f96c1b2388aa0ce2e346baeb08cc56b4d1f047ff7fea7fc2159b75709 +RWRJc1FUaeVeqio24CqOWAnfzl3CugdHW8c8ZYQg1YWUDrytr3+sEmI+JpHIqi7WtiJY2KnhgI/2vVbyLX+ieMSnZyNEALos5wc= +SHA256 (Pkgfile) = fd3211277558189441cc3896129bf2d73fb6064a5e0442708cff71f4a84c432e SHA256 (.footprint) = 8f12e9e6d9a455da2d16fd93dea634cd2a9727108ca7ac1494cc82f56443ab6e SHA256 (libcap-2.28.tar.xz) = c0e70c3bcce288ada2bfe8d748e816b601590495312222e92e307cf18d6a38aa diff --git a/libcap/Pkgfile b/libcap/Pkgfile index fd8fa7b0..f19c1026 100644 --- a/libcap/Pkgfile +++ b/libcap/Pkgfile @@ -5,7 +5,7 @@ name=libcap version=2.28 -release=1 +release=2 source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/… build () { @@ -13,8 +13,7 @@ build () { sed -i "/^CFLAGS/s/-O2/$CFLAGS/" Make.Rules - make - make RAISE_SETFCAP=no DESTDIR=$PKG install + make GOLANG=no RAISE_SETFCAP=no DESTDIR=$PKG install install -d $PKG/usr/lib mv $PKG/lib/libcap.a $PKG/usr/lib

1 0

ports/compat-32 (3.5): libcap-32: 2.27 -> 2.28
by crux＠crux.nu 08 Dec '19

08 Dec '19

commit fef3ab211deff7962bd0c169e716e3b8f78bc121 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Dec 8 23:47:05 2019 +1100 libcap-32: 2.27 -> 2.28 diff --git a/libcap-32/.footprint b/libcap-32/.footprint index 28b500a..eeb22e0 100644 --- a/libcap-32/.footprint +++ b/libcap-32/.footprint @@ -2,7 +2,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libcap.a lrwxrwxrwx root/root usr/lib32/libcap.so -> libcap.so.2 -lrwxrwxrwx root/root usr/lib32/libcap.so.2 -> libcap.so.2.27 --rw-r--r-- root/root usr/lib32/libcap.so.2.27 +lrwxrwxrwx root/root usr/lib32/libcap.so.2 -> libcap.so.2.28 +-rw-r--r-- root/root usr/lib32/libcap.so.2.28 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/libcap.pc diff --git a/libcap-32/.signature b/libcap-32/.signature index e8717f0..ed7ccf4 100644 --- a/libcap-32/.signature +++ b/libcap-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXWOoe4Drj/CkiT6YictSvCyL2t4BzlmquFePqguhaFLuxxFLD7MfdfDlHCnanZxgMrxgCS/Tghy3t272nDPsHAA= -SHA256 (Pkgfile) = 990995700c37e64e16fd04458bd285ef5e0f195f081ef0941b3a9a41a52bbf09 -SHA256 (.footprint) = 26f3a6ba560340a1d6d24ff34689bea2d209ff2f9b6f8df5e464ba6943f38bed -SHA256 (libcap-2.27.tar.xz) = dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a +RWSwxGo/zH7eXVSEJzjQznRTyLKaArwk/1JemW2PjGahcIWbHdygXydzIeU1PxogvOZP6kHjiDvRk4msANemuIp8sQYYssNluwM= +SHA256 (Pkgfile) = d7a59cc48aa7749a66eff773822a81f044f958773908ce351e3535813484ff6b +SHA256 (.footprint) = fa8df1bff08edc07a4fdd273906c4ed81f13b9c0c12f33c169db3a97783ebb60 +SHA256 (libcap-2.28.tar.xz) = c0e70c3bcce288ada2bfe8d748e816b601590495312222e92e307cf18d6a38aa diff --git a/libcap-32/Pkgfile b/libcap-32/Pkgfile index f1e88ad..ec1cbe2 100644 --- a/libcap-32/Pkgfile +++ b/libcap-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: attr-32 name=libcap-32 -version=2.27 +version=2.28 release=1 source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/…

1 0

ports/opt (3.5): libesmtp: fix build
by crux＠crux.nu 08 Dec '19

08 Dec '19

commit 6e21b8a579c5d828fce4bc56915cccb20d4b881e Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Dec 8 23:37:17 2019 +1100 libesmtp: fix build diff --git a/libesmtp/.signature b/libesmtp/.signature index bb5fa07de..6c4dfe8b6 100644 --- a/libesmtp/.signature +++ b/libesmtp/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dlgZC7CWvihgYOAS0ZkWOurLTEyGxIPKvkDmerJZylZlI3wk5D9w/NKnbyVrQeiVmNQUPSEjg7MbklvfkLFKwU= -SHA256 (Pkgfile) = c32d8c9719d10179a6b8c060f7469a368d7f92fe0e46a47961fbeb8fafe588d7 +RWSE3ohX2g5d/YsEq4r2AzxRQGREoGHhJWIBSF4LJkCzCbGx6RvtFFwjUXg2ysEd1OaY2SrGTtZwsgl3xUpj+X7ympcy0R8uDgQ= +SHA256 (Pkgfile) = 776b88d88ed7817c40857f50d9b6dcbab8850269696ddd43d7a36c9ac3db9221 SHA256 (.footprint) = 0ab43d99a738ede6695a94f8caa028e955111e634353e7d7741cc08aad8d3b68 SHA256 (libesmtp-1.0.6.tar.bz2) = d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b +SHA256 (libesmtp-1.0.6-openssl-1.1-api-compatibility.patch) = d10161f8b01c7865dcb948f8e65e61b8596752856953a605632d2c09dd41494c diff --git a/libesmtp/Pkgfile b/libesmtp/Pkgfile index 5c873a7c4..d6d853648 100644 --- a/libesmtp/Pkgfile +++ b/libesmtp/Pkgfile @@ -1,17 +1,20 @@ # Description: A library for posting electronic mail # URL: http://brianstafford.info/libesmtp # Maintainer: Thomas Penteker, tek at serverop dot de -# Packager: Tilman Sauerbeck, tilman at crux dot nu # Depends on: openssl name=libesmtp version=1.0.6 -release=1 -source=(http://pkgs.fedoraproject.org/repo/pkgs/$name/$name-$version.tar.bz2/bf3915e627fd8f35524a8fdfeed979c8/$name-$version.tar.bz2) +release=2 +source=(https://pkgs.fedoraproject.org/repo/pkgs/$name/$name-$version.tar.bz2/bf3915e627fd8f35524a8fdfeed979c8/$name-$version.tar.bz2 + libesmtp-1.0.6-openssl-1.1-api-compatibility.patch) build() { cd $name-$version + patch -p1 -i $SRC/libesmtp-1.0.6-openssl-1.1-api-compatibility.patch + autoreconf -i + ./configure \ --prefix=/usr \ --with-openssl=/usr \ diff --git a/libesmtp/libesmtp-1.0.6-openssl-1.1-api-compatibility.patch b/libesmtp/libesmtp-1.0.6-openssl-1.1-api-compatibility.patch new file mode 100644 index 000000000..bc3e3f356 --- /dev/null +++ b/libesmtp/libesmtp-1.0.6-openssl-1.1-api-compatibility.patch @@ -0,0 +1,72 @@ +diff --git a/configure.ac b/configure.ac +index 556f220..2c0693d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -303,7 +303,7 @@ if test x$with_openssl != xno ; then + ) + fi + if test x$with_openssl != xno ; then +- AC_CHECK_LIB(ssl, SSL_library_init, [ ++ AC_CHECK_LIB(ssl, SSL_new, [ + with_openssl=yes + LIBS="-lssl -lcrypto $LIBS" + ], [ +diff --git a/smtp-tls.c b/smtp-tls.c +index 9a66806..cfc6589 100644 +--- a/smtp-tls.c ++++ b/smtp-tls.c +@@ -57,6 +57,7 @@ static void *ctx_password_cb_arg; + #ifdef USE_PTHREADS + #include <pthread.h> + static pthread_mutex_t starttls_mutex = PTHREAD_MUTEX_INITIALIZER; ++#if OPENSSL_VERSION_NUMBER < 0x10100000 + static pthread_mutex_t *openssl_mutex; + + static void +@@ -70,6 +71,7 @@ openssl_mutexcb (int mode, int n, + pthread_mutex_unlock (&openssl_mutex[n]); + } + #endif ++#endif + + static int + starttls_init (void) +@@ -77,6 +79,10 @@ starttls_init (void) + if (tls_init) + return 1; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000 ++ /* starting from OpenSSL 1.1.0, OpenSSL uses a new threading API and does its own locking */ ++ /* also initialization has been reworked and is done automatically */ ++ /* so there's not much to do here any more */ + #ifdef USE_PTHREADS + /* Set up mutexes for the OpenSSL library */ + if (openssl_mutex == NULL) +@@ -94,9 +100,10 @@ starttls_init (void) + CRYPTO_set_locking_callback (openssl_mutexcb); + } + #endif +- tls_init = 1; + SSL_load_error_strings (); + SSL_library_init (); ++#endif ++ tls_init = 1; + return 1; + } + +@@ -201,7 +208,15 @@ starttls_create_ctx (smtp_session_t session) + 3207. Servers typically support SSL as well as TLS because some + versions of Netscape do not support TLS. I am assuming that all + currently deployed servers correctly support TLS. */ ++#if OPENSSL_VERSION_NUMBER < 0x10100000 + ctx = SSL_CTX_new (TLSv1_client_method ()); ++#else ++ ctx = SSL_CTX_new (TLS_client_method ()); ++ if (!SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION)) { ++ /* FIXME: set an error code AND free the allocated ctx */ ++ return NULL; ++ } ++#endif + + /* Load our keys and certificates. To avoid messing with configuration + variables etc, use fixed paths for the certificate store. These are

1 0

ports/opt (3.5): elilo: fix build
by crux＠crux.nu 08 Dec '19

08 Dec '19

commit a93ca5bc55adbb337309ea85de3c89d584c0c584 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Dec 8 23:15:22 2019 +1100 elilo: fix build diff --git a/elilo/.signature b/elilo/.signature index 024dc9c9b..f688f4db8 100644 --- a/elilo/.signature +++ b/elilo/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UOhTqebxkml0ExXwCLLxi53wLOMQ2M/KGw/F6P7jaRVDbJhGeJwy/awSvmgmrCqEiKJe+09QYAFOatAbf26xQw= -SHA256 (Pkgfile) = 32a2460df662410aea18f40b14b5ac322c4f47eeee2883a26e271585363b9c9f +RWSE3ohX2g5d/UrniTyen21dIpZdrBgKO4+TIq/ocFmUfmAzMvO2+m20wD5lypaijAvcUozkHlnQhWrsNWxDRJm/rbyMZI2gDg4= +SHA256 (Pkgfile) = ee592f58750d5af3e0260640bcd89de25df44bbf532f98cb2089d0eb473d38de SHA256 (.footprint) = 14b5a412144a3aa56ee80500beb67647f360cc8f50af0a7213fa83afd3072103 SHA256 (elilo-3.16-all.tar.gz) = 69e361d95c01ea2657200b2215464fc0235b01d3e317d2f2276284259b06d392 +SHA256 (elilo-3.16-strncpy-clash.patch) = c213ecd8097739a08f905749c951bcfba909b6be776734dfe69fe3432246baa1 diff --git a/elilo/Pkgfile b/elilo/Pkgfile index c3b3f298f..f2f65279c 100644 --- a/elilo/Pkgfile +++ b/elilo/Pkgfile @@ -5,8 +5,9 @@ name=elilo version=3.16 -release=1 -source=(https://downloads.sourceforge.net/project/$name/$name/$name-$version/$name-$version-all.tar.gz) +release=2 +source=(https://downloads.sourceforge.net/project/$name/$name/$name-$version/$name-$version-all.tar.gz + elilo-3.16-strncpy-clash.patch) build() { tar xzf elilo-$version-source.tar.gz @@ -15,6 +16,8 @@ build() { #sed -i 's|DEBUGFLAGS = -Wall|DEBUGFLAGS = -Wall -Wno-error|g' Make.defaults sed -i 's|dpkg-architecture -qDEB_BUILD_ARCH|uname -m|g' Make.defaults + patch -p1 -i $SRC/elilo-3.16-strncpy-clash.patch + make -j1 install -D elilo.efi $PKG/usr/share/elilo/elilo.efi install -D tools/eliloalt $PKG/usr/sbin/eliloalt diff --git a/elilo/elilo-3.16-strncpy-clash.patch b/elilo/elilo-3.16-strncpy-clash.patch new file mode 100644 index 000000000..fb2f6878b --- /dev/null +++ b/elilo/elilo-3.16-strncpy-clash.patch @@ -0,0 +1,23 @@ +gnu-efi-3.0.8 added StrnCpy. This caused conflict with elilo's definition: + ./../fs/../strops.h:30:16: error: conflicting types for 'StrnCpy' + extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count); + ^~~~~~~ + +Work it around by always using private copy. + +Reported-by: Bill Glessner +--- a/strops.h ++++ b/strops.h +@@ -29,3 +29,4 @@ + extern CHAR16 *StrChr(IN const CHAR16 *s, const CHAR16 c); ++#define StrnCpy elilo_StrnCpy + extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count); + extern CHAR8 *StrnXCpy(OUT CHAR8 *dst, IN const CHAR16 *src, UINTN count); +--- a/strops.c ++++ b/strops.c +@@ -27,4 +27,6 @@ + #include <efilib.h> + ++#include "strops.h" ++ + //#define CHAR_NULL (CHAR16)'\0'

1 0

ports/opt (3.5): consolekit: fix dependenices for footprint
by crux＠crux.nu 08 Dec '19

08 Dec '19

commit 8cbcf0f413cbf9ae0acd7e42cd01ba96ab476714 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Dec 8 22:57:30 2019 +1100 consolekit: fix dependenices for footprint diff --git a/consolekit/.signature b/consolekit/.signature index 790b428ed..dd7aa106a 100644 --- a/consolekit/.signature +++ b/consolekit/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WXPzdBQZnubPcLdo4HfFWApTNR8E2Jojs1MW0p1yA16iJU9j7u5tuwNBVHNCdirG/DsedcBRtSwBM32Ob3/ugQ= -SHA256 (Pkgfile) = 08e431a321bbe9b9cea28ccaa74ed5cbf28c3fb2f94b0504c0151efb9a4a9a6c +RWSE3ohX2g5d/XNlBfIL9mZ+arHPNdGUi5iCQ5lXjbpawO5hjwPB+8HfE8CP/E+u07f20kKecY7ZJzCYDwHj9gNlxo79SjGxjAw= +SHA256 (Pkgfile) = 9b0ef3487412d157f9eb50759feabef9ade0270d5ce0cbb722889ce3332bafc0 SHA256 (.footprint) = 4f82ae4068647763cb9f461dd4ee201db0589fe0e2c7019e773cfdcc9719e4f4 SHA256 (ConsoleKit2-1.2.1.tar.bz2) = 9af223096ece88b217bcd3fe85093390a8d1527b6492124b0e90ea7688ec934b SHA256 (system-session) = 599613516a16ac997a4121b4f20dd3a9c8480403614848f1aa97a0a0f1c6a236 diff --git a/consolekit/Pkgfile b/consolekit/Pkgfile index 62fb38e7f..ced883fb6 100644 --- a/consolekit/Pkgfile +++ b/consolekit/Pkgfile @@ -1,7 +1,7 @@ # Description: Framework for defining and tracking users, login sessions, and seats # URL: http://www.freedesktop.org/wiki/Software/ConsoleKit # Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve -# Depends on: linux-pam util-linux dbus glib xorg-libx11 +# Depends on: dbus gobject-introspection linux-pam util-linux xorg-libx11 # Optional: polkit name=consolekit

1 0