diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-11 12:29:23 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-11 12:29:23 +0100 |
commit | 407f9b8fde3ad9cc55f39f7a548cde6056dab494 (patch) | |
tree | 0375ea8ddab3502bf6883066f43fc7e328d5c704 /package/tcp_wrappers | |
parent | 2ecefcf609e484d04d1546581191831e07ad71ec (diff) | |
parent | abb858ae43374dc13a5fcef19b9e0ba9442013bb (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/tcp_wrappers')
-rw-r--r-- | package/tcp_wrappers/Makefile | 2 | ||||
-rw-r--r-- | package/tcp_wrappers/patches/patch-Makefile | 4 | ||||
-rw-r--r-- | package/tcp_wrappers/patches/patch-cflags | 4 | ||||
-rw-r--r-- | package/tcp_wrappers/patches/patch-tcpd_h | 19 |
4 files changed, 13 insertions, 16 deletions
diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile index 15bee1ae6..e4b570f68 100644 --- a/package/tcp_wrappers/Makefile +++ b/package/tcp_wrappers/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcp_wrappers PKG_VERSION:= 7.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= e6fa25f71226d090f34de3f6b122fb5a PKG_DESCR:= IP based access control PKG_SECTION:= libs diff --git a/package/tcp_wrappers/patches/patch-Makefile b/package/tcp_wrappers/patches/patch-Makefile index dd737d4d5..ba92af2df 100644 --- a/package/tcp_wrappers/patches/patch-Makefile +++ b/package/tcp_wrappers/patches/patch-Makefile @@ -1,5 +1,5 @@ --- tcp_wrappers_7.6.orig/Makefile 1997-03-21 19:27:21.000000000 +0100 -+++ tcp_wrappers_7.6/Makefile 2011-01-17 15:40:16.000000000 +0100 ++++ tcp_wrappers_7.6/Makefile 2013-12-22 16:30:35.000000000 +0100 @@ -1,5 +1,8 @@ # @(#) Makefile 1.23 97/03/21 19:27:20 @@ -66,7 +66,7 @@ #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DINET_ADDR_BUG #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DSOLARIS_24_GETHOSTBYNAME_BUG -@@ -464,7 +475,7 @@ BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS +@@ -464,7 +475,7 @@ BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS # If your system supports NIS or YP-style netgroups, enable the following # macro definition. Netgroups are used only for host access control. # diff --git a/package/tcp_wrappers/patches/patch-cflags b/package/tcp_wrappers/patches/patch-cflags index 3ad8a423f..06e60861d 100644 --- a/package/tcp_wrappers/patches/patch-cflags +++ b/package/tcp_wrappers/patches/patch-cflags @@ -1,4 +1,4 @@ --- tcp_wrappers_7.6.orig/cflags 1970-01-01 00:00:00.000000000 +0100 -+++ tcp_wrappers_7.6/cflags 2011-01-17 15:32:42.000000000 +0100 ++++ tcp_wrappers_7.6/cflags 2013-12-22 16:30:36.000000000 +0100 @@ -0,0 +1 @@ -+-march=pentium-m -Os -pipe -fomit-frame-pointer -fwrapv -fstack-protector -fno-ident -fhonour-copts -DFACILITY=LOG_DAEMON -DHOSTS_ACCESS -DDAEMON_UMASK=022 -DREAL_DAEMON_DIR="/usr/sbin" -DPROCESS_OPTIONS -DKILL_IP_OPTIONS -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DHOSTS_DENY="/etc/hosts.deny" -DHOSTS_ALLOW="/etc/hosts.allow" -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len ++-march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -fno-unwind-tables -fno-asynchronous-unwind-tables -g3 -DFACILITY=LOG_DAEMON -DHOSTS_ACCESS -DDAEMON_UMASK=022 -DREAL_DAEMON_DIR="/usr/sbin" -DPROCESS_OPTIONS -DKILL_IP_OPTIONS -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DHOSTS_DENY="/etc/hosts.deny" -DHOSTS_ALLOW="/etc/hosts.allow" -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len diff --git a/package/tcp_wrappers/patches/patch-tcpd_h b/package/tcp_wrappers/patches/patch-tcpd_h index 71627fe47..643a36217 100644 --- a/package/tcp_wrappers/patches/patch-tcpd_h +++ b/package/tcp_wrappers/patches/patch-tcpd_h @@ -1,6 +1,6 @@ --- tcp_wrappers_7.6.orig/tcpd.h 1996-03-19 16:22:25.000000000 +0100 -+++ tcp_wrappers_7.6/tcpd.h 2009-06-05 18:45:03.000000000 +0200 -@@ -4,6 +4,25 @@ ++++ tcp_wrappers_7.6/tcpd.h 2013-12-22 16:52:10.000000000 +0100 +@@ -4,6 +4,24 @@ * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ @@ -21,12 +21,11 @@ +#include <netinet/in.h> +#include <stdio.h> + -+__BEGIN_DECLS + /* Structure to describe one communications endpoint. */ #define STRING_LENGTH 128 /* hosts, users, processes */ -@@ -25,10 +44,10 @@ struct request_info { +@@ -25,10 +43,10 @@ struct request_info { char pid[10]; /* access via eval_pid(request) */ struct host_info client[1]; /* client endpoint info */ struct host_info server[1]; /* server endpoint info */ @@ -41,7 +40,7 @@ struct netconfig *config; /* netdir handle */ }; -@@ -61,25 +80,30 @@ extern char paranoid[]; +@@ -61,25 +79,30 @@ extern char paranoid[]; /* Global functions. */ #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) @@ -82,7 +81,7 @@ extern char *hosts_allow_table; /* for verification mode redirection */ extern char *hosts_deny_table; /* for verification mode redirection */ extern int hosts_access_verbose; /* for verbose matching mode */ -@@ -92,9 +116,14 @@ extern int resident; /* > 0 if residen +@@ -92,9 +115,14 @@ extern int resident; /* > 0 if residen */ #ifdef __STDC__ @@ -97,7 +96,7 @@ extern struct request_info *request_init(); /* initialize request */ extern struct request_info *request_set(); /* update request structure */ #endif -@@ -117,27 +146,31 @@ extern struct request_info *request_set( +@@ -117,27 +145,31 @@ extern struct request_info *request_set( * host_info structures serve as caches for the lookup results. */ @@ -139,7 +138,7 @@ #endif /* -@@ -178,7 +211,7 @@ extern struct tcpd_context tcpd_context; +@@ -178,7 +210,7 @@ extern struct tcpd_context tcpd_context; * behavior. */ @@ -148,11 +147,9 @@ extern int dry_run; /* verification flag */ /* Bug workarounds. */ -@@ -217,3 +250,7 @@ extern char *fix_strtok(); +@@ -217,3 +249,5 @@ extern char *fix_strtok(); #define strtok my_strtok extern char *my_strtok(); #endif + -+__END_DECLS -+ +#endif /* tcpd.h */ |