[arch-commits] Commit in (6 files)

Maxime Gauduin alucryd at archlinux.org
Sun Oct 2 13:41:56 UTC 2016


    Date: Sunday, October 2, 2016 @ 13:41:56
  Author: alucryd
Revision: 191211

Split libwrap from tcp-wrappers

Added:
  lib32-libwrap/
  lib32-libwrap/trunk/
  lib32-libwrap/trunk/PKGBUILD
  lib32-libwrap/trunk/tcp-wrappers-headers.patch
  lib32-libwrap/trunk/tcp-wrappers-redhat-bug11881.patch
Modified:
  steam-native-runtime/trunk/PKGBUILD

--------------------------------------------------------+
 lib32-libwrap/trunk/PKGBUILD                           |   58 ++
 lib32-libwrap/trunk/tcp-wrappers-headers.patch         |  296 +++++++++++++++
 lib32-libwrap/trunk/tcp-wrappers-redhat-bug11881.patch |   36 +
 steam-native-runtime/trunk/PKGBUILD                    |   16 
 4 files changed, 399 insertions(+), 7 deletions(-)

Added: lib32-libwrap/trunk/PKGBUILD
===================================================================
--- lib32-libwrap/trunk/PKGBUILD	                        (rev 0)
+++ lib32-libwrap/trunk/PKGBUILD	2016-10-02 13:41:56 UTC (rev 191211)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Manuel Hüsers <manuel.huesers at uni-ol.de>
+# Contributor: vigo <vigo.the.unholy.carpathian at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=lib32-libwrap
+pkgver=7.6.24
+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' 'libwrap')
+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-headers.patch'
+        'tcp-wrappers-redhat-bug11881.patch')
+sha256sums=('9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d'
+            '672ad0d3f70579815cd8f15c29054c49f6fd9902863be42cc2452a9ecbe8eacd'
+            'caf0719fdac5c0c8874420af63bddf3b970c40d464f0553a9822a53d372854d8'
+            '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-headers.patch
+  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:


Property changes on: lib32-libwrap/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: lib32-libwrap/trunk/tcp-wrappers-headers.patch
===================================================================
--- lib32-libwrap/trunk/tcp-wrappers-headers.patch	                        (rev 0)
+++ lib32-libwrap/trunk/tcp-wrappers-headers.patch	2016-10-02 13:41:56 UTC (rev 191211)
@@ -0,0 +1,296 @@
+--- a/options.c
++++ b/options.c
+@@ -34,6 +34,8 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+--- a/safe_finger.c
++++ b/safe_finger.c
+@@ -20,6 +20,11 @@
+ 
+ /* System libraries */
+ 
++#include <unistd.h>
++#include <fcntl.h>
++#include <stdlib.h>
++#include <sys/wait.h>
++#include <grp.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <signal.h>
+@@ -27,7 +31,7 @@
+ #include <ctype.h>
+ #include <pwd.h>
+ 
+-extern void exit();
++int pipe_stdin(char **argv);
+ 
+ /* Local stuff */
+ 
+--- a/scaffold.c
++++ b/scaffold.c
+@@ -10,6 +10,7 @@
+ 
+ /* System libraries. */
+ 
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
+@@ -27,7 +27,4 @@
+ #endif
+ 
+-#ifndef INET6
+-extern char *malloc();
+-#endif
+ 
+ /* Application-specific. */
+--- a/shell_cmd.c
++++ b/shell_cmd.c
+@@ -14,6 +14,10 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
++#include <stdlib.h>
++#include <fcntl.h>
++#include <sys/wait.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <signal.h>
+@@ -25,8 +25,6 @@
+ #include <syslog.h>
+ #include <string.h>
+ 
+-extern void exit();
+-
+ /* Local stuff. */
+ 
+ #include "tcpd.h"
+--- a/tcpdchk.c
++++ b/tcpdchk.c
+@@ -20,6 +20,8 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #ifdef INET6
+@@ -35,10 +36,7 @@
+ #include <netdb.h>
+ #include <string.h>
+ 
+-extern int errno;
+-extern void exit();
+-extern int optind;
+-extern char *optarg;
++int cidr_mask_addr(char *str);
+ 
+ #ifndef INADDR_NONE
+ #define INADDR_NONE     (-1)		/* XXX should be 0xffffffff */
+--- a/clean_exit.c
++++ b/clean_exit.c
+@@ -13,8 +13,8 @@
+ #endif
+ 
+ #include <stdio.h>
+-
+-extern void exit();
++#include <unistd.h>
++#include <stdlib.h>
+ 
+ #include "tcpd.h"
+ 
+--- a/hosts_access.c
++++ b/hosts_access.c
+@@ -23,6 +23,7 @@
+ 
+ /* System libraries. */
+ 
++#include <stdlib.h>
+ #include <sys/types.h>
+ #ifdef INT32_T
+     typedef uint32_t u_int32_t;
+@@ -43,8 +44,8 @@
+ #include <netdb.h>
+ #endif
+ 
+-extern char *fgets();
+-extern int errno;
++static int match_pattern_ylo(const char *s, const char *pattern);
++int cidr_mask_addr(char *str);
+ 
+ #ifndef	INADDR_NONE
+ #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
+--- a/inetcf.c
++++ b/inetcf.c
+@@ -9,15 +9,14 @@
+ static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";
+ #endif
+ 
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+ 
+-extern int errno;
+-extern void exit();
+-
++#include "scaffold.h"
+ #include "tcpd.h"
+ #include "inetcf.h"
+ 
+--- a/percent_x.c
++++ b/percent_x.c
+@@ -16,12 +16,12 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <string.h>
+ 
+-extern void exit();
+-
+ /* Local stuff. */
+ 
+ #include "tcpd.h"
+--- a/rfc931.c
++++ b/rfc931.c
+@@ -15,6 +15,7 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <sys/types.h>
+--- a/tcpd.c
++++ b/tcpd.c
+@@ -16,6 +16,7 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+@@ -39,6 +39,8 @@
+ #include "patchlevel.h"
+ #include "tcpd.h"
+ 
++void fix_options(struct request_info *request);
++
+ int     allow_severity = SEVERITY;	/* run-time adjustable */
+ int     deny_severity = LOG_WARNING;	/* ditto */
+ 
+--- a/tcpdmatch.c
++++ b/tcpdmatch.c
+@@ -19,6 +19,8 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
+@@ -30,9 +32,6 @@
+ #include <setjmp.h>
+ #include <string.h>
+ 
+-extern void exit();
+-extern int optind;
+-extern char *optarg;
+ 
+ #ifndef	INADDR_NONE
+ #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
+--- a/update.c
++++ b/update.c
+@@ -19,6 +19,7 @@
+ 
+ /* System libraries */
+ 
++#include <unistd.h>
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <string.h>
+--- a/misc.c
++++ b/misc.c
+@@ -14,11 +14,10 @@
+ #include <arpa/inet.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "tcpd.h"
+ 
+-extern char *fgets();
+-
+ #ifndef	INADDR_NONE
+ #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
+ #endif
+--- a/fix_options.c
++++ b/fix_options.c
+@@ -32,6 +32,7 @@
+ 
+ /* fix_options - get rid of IP-level socket options */
+ 
++void
+ fix_options(request)
+ struct request_info *request;
+ {
+@@ -38,11 +38,8 @@
+ #ifdef IP_OPTIONS
+     unsigned char optbuf[BUFFER_SIZE / 3], *cp;
+     char    lbuf[BUFFER_SIZE], *lp;
+-#ifdef __GLIBC__
+-    size_t  optsize = sizeof(optbuf), ipproto;
+-#else
+-    int     optsize = sizeof(optbuf), ipproto;
+-#endif
++    socklen_t optsize = sizeof(optbuf);
++    int ipproto;
+     struct protoent *ip;
+     int     fd = request->fd;
+     unsigned int opt;
+--- a/socket.c
++++ b/socket.c
+@@ -95,11 +95,7 @@
+     static struct sockaddr_in client;
+     static struct sockaddr_in server;
+ #endif
+-#ifdef __GLIBC__
+-    size_t  len;
+-#else
+-    int     len;
+-#endif
++    socklen_t len;
+     char    buf[BUFSIZ];
+     int     fd = request->fd;
+ 
+@@ -430,11 +426,7 @@
+ #else
+     struct sockaddr_in sin;
+ #endif
+-#ifdef __GLIBC__
+-    size_t  size = sizeof(sin);
+-#else
+-    int     size = sizeof(sin);
+-#endif
++    socklen_t size;
+ 
+     /*
+      * Eat up the not-yet received datagram. Some systems insist on a
+

Added: lib32-libwrap/trunk/tcp-wrappers-redhat-bug11881.patch
===================================================================
--- lib32-libwrap/trunk/tcp-wrappers-redhat-bug11881.patch	                        (rev 0)
+++ lib32-libwrap/trunk/tcp-wrappers-redhat-bug11881.patch	2016-10-02 13:41:56 UTC (rev 191211)
@@ -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);
+

Modified: steam-native-runtime/trunk/PKGBUILD
===================================================================
--- steam-native-runtime/trunk/PKGBUILD	2016-10-02 13:32:39 UTC (rev 191210)
+++ steam-native-runtime/trunk/PKGBUILD	2016-10-02 13:41:56 UTC (rev 191211)
@@ -4,7 +4,7 @@
 
 pkgname=steam-native-runtime
 pkgver=1.0.0.52
-pkgrel=6
+pkgrel=7
 pkgdesc='Native replacement for the Steam runtime'
 arch=('i686' 'x86_64')
 url='https://wiki.archlinux.org/index.php/Steam/Troubleshooting#Native_runtime'
@@ -15,10 +15,11 @@
          'libcups' 'libcurl-compat' 'libcurl-gnutls' 'libdbus' 'libdrm'
          'libgcrypt15' 'libice' 'libjpeg6' 'libnm-glib' 'libpng12' 'libpulse'
          'librtmp0' 'libsm' 'libtheora' 'libtiff4' 'libudev0-shim' 'libusb'
-         'libvorbis' 'libxcomposite' 'libxcursor' 'libxft' 'libxi'
-         'libxinerama' 'libxmu' 'libxrandr' 'libxrender' 'libxtst' 'libxxf86vm'
-         'nspr' 'nss' 'openal' 'pango' 'sdl' 'sdl2' 'sdl2_image' 'sdl2_mixer'
-         'sdl2_ttf' 'sdl_image' 'sdl_mixer' 'sdl_ttf' 'vulkan-icd-loader')
+         'libvorbis' 'libvpx1.3' 'libwrap' 'libxcomposite' 'libxcursor'
+         'libxft' 'libxi' 'libxinerama' 'libxmu' 'libxrandr' 'libxrender'
+         'libxtst' 'libxxf86vm' 'nspr' 'nss' 'openal' 'pango' 'sdl' 'sdl2'
+         'sdl2_image' 'sdl2_mixer' 'sdl2_ttf' 'sdl_image' 'sdl_mixer'
+         'sdl_ttf' 'vulkan-icd-loader')
 depends_x86_64=('lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-atk' 'lib32-cairo'
                 'lib32-curl' 'lib32-dbus-glib' 'lib32-fontconfig'
                 'lib32-freetype2' 'lib32-gconf' 'lib32-gdk-pixbuf2'
@@ -30,8 +31,9 @@
                 'lib32-libnm-glib' 'lib32-libpng12' 'lib32-libpulse'
                 'lib32-librtmp0' 'lib32-libsm' 'lib32-libtheora'
                 'lib32-libtiff4' 'lib32-libudev0-shim' 'lib32-libusb'
-                'lib32-libvorbis' 'lib32-libxcomposite' 'lib32-libxcursor'
-                'lib32-libxft' 'lib32-libxi' 'lib32-libxinerama' 'lib32-libxmu'
+                'lib32-libvorbis' 'lib32-libvpx1.3' 'lib32-libwrap'
+                'lib32-libxcomposite' 'lib32-libxcursor' 'lib32-libxft'
+                'lib32-libxi' 'lib32-libxinerama' 'lib32-libxmu'
                 'lib32-libxrandr' 'lib32-libxrender' 'lib32-libxtst'
                 'lib32-libxxf86vm' 'lib32-nspr' 'lib32-nss' 'lib32-openal'
                 'lib32-pango' 'lib32-sdl' 'lib32-sdl2' 'lib32-sdl2_image'



More information about the arch-commits mailing list