Date: Thursday, March 18, 2021 @ 08:23:37 Author: alucryd Revision: 894304
archrelease: copy trunk to multilib-x86_64 Added: lib32-libwrap/repos/multilib-x86_64/PKGBUILD (from rev 894303, lib32-libwrap/trunk/PKGBUILD) lib32-libwrap/repos/multilib-x86_64/tcp-wrappers-redhat-bug11881.patch (from rev 894303, lib32-libwrap/trunk/tcp-wrappers-redhat-bug11881.patch) Deleted: lib32-libwrap/repos/multilib-x86_64/PKGBUILD lib32-libwrap/repos/multilib-x86_64/tcp-wrappers-redhat-bug11881.patch ------------------------------------+ PKGBUILD | 124 +++++++++++++++++------------------ tcp-wrappers-redhat-bug11881.patch | 72 ++++++++++---------- 2 files changed, 98 insertions(+), 98 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-03-18 08:23:30 UTC (rev 894303) +++ PKGBUILD 2021-03-18 08:23:37 UTC (rev 894304) @@ -1,62 +0,0 @@ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Manuel Hüsers <manuel.hues...@uni-ol.de> -# Contributor: vigo <vigo.the.unholy.carpath...@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=lib32-libwrap -pkgver=7.6.28 -pkgrel=1 -pkgdesc='Monitors and controls incoming TCP connections' -arch=(x86_64) -url=ftp://ftp.porcupine.org/pub/security/index.html -license=(BSD) -depends=( - lib32-glibc - lib32-libnsl - libwrap -) -provides=(lib32-tcp_wrappers-libs) -conflicts=(lib32-tcp_wrappers-libs) -options=(!makeflags) -source=( - ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${pkgver%.*}.tar.gz - http://http.debian.net/debian/pool/main/t/tcp-wrappers/tcp-wrappers_${pkgver%.*}.q-${pkgver##*.}.debian.tar.xz - tcp-wrappers-redhat-bug11881.patch -) -sha256sums=('9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d' - '9e878177878b7796ab9e8cb4abb094bf66b3d37e0e1af3cee3e24afde4b1e11f' - '2e527e54c1ea208de10a206c667f751e54651eb77c973271d213e3459d690403') - -prepare() { - cd tcp_wrappers_${pkgver%.*} - - for patch in $(cat ../debian/patches/series); do - patch -Np1 -i ../debian/patches/${patch} - done - patch -Np1 -i ../tcp-wrappers-redhat-bug11881.patch -} - -build() { - cd tcp_wrappers_${pkgver%.*} - - make \ - COPTS="$CFLAGS -m32" \ - LDOPTS="$LDFLAGS -m32" \ - REAL_DAEMON_DIR=/usr/bin \ - STYLE=-DPROCESS_OPTIONS \ - linux -} - -package() { - cd tcp_wrappers_${pkgver%.*} - - install -Dm 644 shared/libwrap.so.0.${pkgver%.*} -t "${pkgdir}"/usr/lib32/ - ln -s libwrap.so.0.${pkgver%.*} "${pkgdir}"/usr/lib32/libwrap.so.0 - ln -s libwrap.so.0 "${pkgdir}"/usr/lib32/libwrap.so - - install -dm 755 "${pkgdir}"/usr/share/licenses - ln -s libwrap "${pkgdir}"/usr/share/licenses/lib32-libwrap -} - -# vim: ts=2 sw=2 et: Copied: lib32-libwrap/repos/multilib-x86_64/PKGBUILD (from rev 894303, lib32-libwrap/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-03-18 08:23:37 UTC (rev 894304) @@ -0,0 +1,62 @@ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Manuel Hüsers <manuel.hues...@uni-ol.de> +# Contributor: vigo <vigo.the.unholy.carpath...@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=lib32-libwrap +pkgver=7.6.31 +pkgrel=1 +pkgdesc='Monitors and controls incoming TCP connections' +arch=(x86_64) +url=ftp://ftp.porcupine.org/pub/security/index.html +license=(BSD) +depends=( + lib32-glibc + lib32-libnsl + libwrap +) +provides=(lib32-tcp_wrappers-libs) +conflicts=(lib32-tcp_wrappers-libs) +options=(!makeflags) +source=( + ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${pkgver%.*}.tar.gz + http://http.debian.net/debian/pool/main/t/tcp-wrappers/tcp-wrappers_${pkgver%.*}.q-${pkgver##*.}.debian.tar.xz + tcp-wrappers-redhat-bug11881.patch +) +sha256sums=('9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d' + '20fec7826bde1262007e6dd43f365b5802bacc283942d93b78385ea634dc594a' + '2e527e54c1ea208de10a206c667f751e54651eb77c973271d213e3459d690403') + +prepare() { + cd tcp_wrappers_${pkgver%.*} + + for patch in $(cat ../debian/patches/series); do + patch -Np1 -i ../debian/patches/${patch} + done + patch -Np1 -i ../tcp-wrappers-redhat-bug11881.patch +} + +build() { + cd tcp_wrappers_${pkgver%.*} + + make \ + COPTS="$CFLAGS -m32" \ + LDOPTS="$LDFLAGS -m32" \ + REAL_DAEMON_DIR=/usr/bin \ + STYLE=-DPROCESS_OPTIONS \ + linux +} + +package() { + cd tcp_wrappers_${pkgver%.*} + + install -Dm 644 shared/libwrap.so.0.${pkgver%.*} -t "${pkgdir}"/usr/lib32/ + ln -s libwrap.so.0.${pkgver%.*} "${pkgdir}"/usr/lib32/libwrap.so.0 + ln -s libwrap.so.0 "${pkgdir}"/usr/lib32/libwrap.so + + install -dm 755 "${pkgdir}"/usr/share/licenses + ln -s libwrap "${pkgdir}"/usr/share/licenses/lib32-libwrap +} + +# vim: ts=2 sw=2 et: Deleted: tcp-wrappers-redhat-bug11881.patch =================================================================== --- tcp-wrappers-redhat-bug11881.patch 2021-03-18 08:23:30 UTC (rev 894303) +++ tcp-wrappers-redhat-bug11881.patch 2021-03-18 08:23:37 UTC (rev 894304) @@ -1,36 +0,0 @@ ---- tcp_wrappers_7.6/tcpd.c.bug11881 -+++ tcp_wrappers_7.6/tcpd.c -@@ -60,10 +60,10 @@ - */ - - if (argv[0][0] == '/') { -- strcpy(path, argv[0]); -+ strncpy(path, argv[0], sizeof(path)); - argv[0] = strrchr(argv[0], '/') + 1; - } else { -- sprintf(path, "%s/%s", REAL_DAEMON_DIR, argv[0]); -+ snprintf(path, sizeof(path), "%s/%s", REAL_DAEMON_DIR, argv[0]); - } - - /* ---- tcp_wrappers_7.6/eval.c.bug11881 -+++ tcp_wrappers_7.6/eval.c -@@ -111,7 +111,7 @@ - return (hostinfo); - #endif - if (STR_NE(eval_user(request), unknown)) { -- sprintf(both, "%s@%s", request->user, hostinfo); -+ snprintf(both, sizeof(both), "%s@%s", request->user, hostinfo); - return (both); - } else { - return (hostinfo); -@@ -128,7 +128,7 @@ - char *daemon = eval_daemon(request); - - if (STR_NE(host, unknown)) { -- sprintf(both, "%s@%s", daemon, host); -+ snprintf(both, sizeof(both), "%s@%s", daemon, host); - return (both); - } else { - return (daemon); - Copied: lib32-libwrap/repos/multilib-x86_64/tcp-wrappers-redhat-bug11881.patch (from rev 894303, lib32-libwrap/trunk/tcp-wrappers-redhat-bug11881.patch) =================================================================== --- tcp-wrappers-redhat-bug11881.patch (rev 0) +++ tcp-wrappers-redhat-bug11881.patch 2021-03-18 08:23:37 UTC (rev 894304) @@ -0,0 +1,36 @@ +--- tcp_wrappers_7.6/tcpd.c.bug11881 ++++ tcp_wrappers_7.6/tcpd.c +@@ -60,10 +60,10 @@ + */ + + if (argv[0][0] == '/') { +- strcpy(path, argv[0]); ++ strncpy(path, argv[0], sizeof(path)); + argv[0] = strrchr(argv[0], '/') + 1; + } else { +- sprintf(path, "%s/%s", REAL_DAEMON_DIR, argv[0]); ++ snprintf(path, sizeof(path), "%s/%s", REAL_DAEMON_DIR, argv[0]); + } + + /* +--- tcp_wrappers_7.6/eval.c.bug11881 ++++ tcp_wrappers_7.6/eval.c +@@ -111,7 +111,7 @@ + return (hostinfo); + #endif + if (STR_NE(eval_user(request), unknown)) { +- sprintf(both, "%s@%s", request->user, hostinfo); ++ snprintf(both, sizeof(both), "%s@%s", request->user, hostinfo); + return (both); + } else { + return (hostinfo); +@@ -128,7 +128,7 @@ + char *daemon = eval_daemon(request); + + if (STR_NE(host, unknown)) { +- sprintf(both, "%s@%s", daemon, host); ++ snprintf(both, sizeof(both), "%s@%s", daemon, host); + return (both); + } else { + return (daemon); +