summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch24
1 files changed, 13 insertions, 11 deletions
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
index e8289e44d9..d473fb6342 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
@@ -1,9 +1,10 @@
1Upstream-Status: Backport 1Upstream-Status: Backport
2 2
3diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile 3Index: tcp_wrappers_7.6/Makefile
4--- tcp_wrappers_7.6.orig/Makefile 2003-08-21 01:43:39.000000000 +0200 4===================================================================
5+++ tcp_wrappers_7.6/Makefile 2003-08-21 01:43:35.000000000 +0200 5--- tcp_wrappers_7.6.orig/Makefile
6@@ -45,7 +45,7 @@ 6+++ tcp_wrappers_7.6/Makefile
7@@ -45,7 +45,7 @@ what:
7 # 8 #
8 # SysV.4 Solaris 2.x OSF AIX 9 # SysV.4 Solaris 2.x OSF AIX
9 #REAL_DAEMON_DIR=/usr/sbin 10 #REAL_DAEMON_DIR=/usr/sbin
@@ -12,7 +13,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
12 # BSD 4.4 13 # BSD 4.4
13 #REAL_DAEMON_DIR=/usr/libexec 14 #REAL_DAEMON_DIR=/usr/libexec
14 # 15 #
15@@ -512,6 +519,7 @@ 16@@ -513,6 +513,7 @@ VSYSLOG = -Dvsyslog=myvsyslog
16 # (examples: allow, deny, banners, twist and spawn). 17 # (examples: allow, deny, banners, twist and spawn).
17 # 18 #
18 #STYLE = -DPROCESS_OPTIONS # Enable language extensions. 19 #STYLE = -DPROCESS_OPTIONS # Enable language extensions.
@@ -20,7 +21,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
20 21
21 ################################################################ 22 ################################################################
22 # Optional: Changing the default disposition of logfile records 23 # Optional: Changing the default disposition of logfile records
23@@ -535,6 +543,7 @@ 24@@ -536,6 +537,7 @@ VSYSLOG = -Dvsyslog=myvsyslog
24 # The LOG_XXX names below are taken from the /usr/include/syslog.h file. 25 # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
25 26
26 FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use 27 FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use
@@ -28,7 +29,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
28 29
29 # The syslog priority at which successful connections are logged. 30 # The syslog priority at which successful connections are logged.
30 31
31@@ -631,6 +640,7 @@ 32@@ -632,6 +634,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\
32 # lookups altogether, see the next section. 33 # lookups altogether, see the next section.
33 34
34 PARANOID= -DPARANOID 35 PARANOID= -DPARANOID
@@ -36,7 +37,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
36 37
37 ######################################## 38 ########################################
38 # Optional: turning off hostname lookups 39 # Optional: turning off hostname lookups
39@@ -644,6 +654,7 @@ 40@@ -645,6 +648,7 @@ PARANOID= -DPARANOID
40 # mode (see previous section) and comment out the following definition. 41 # mode (see previous section) and comment out the following definition.
41 42
42 HOSTNAME= -DALWAYS_HOSTNAME 43 HOSTNAME= -DALWAYS_HOSTNAME
@@ -44,7 +45,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
44 45
45 ############################################# 46 #############################################
46 # Optional: Turning on host ADDRESS checking 47 # Optional: Turning on host ADDRESS checking
47@@ -670,6 +681,7 @@ 48@@ -671,6 +675,7 @@ HOSTNAME= -DALWAYS_HOSTNAME
48 # Solaris 2.x, and Linux. See your system documentation for details. 49 # Solaris 2.x, and Linux. See your system documentation for details.
49 # 50 #
50 # KILL_OPT= -DKILL_IP_OPTIONS 51 # KILL_OPT= -DKILL_IP_OPTIONS
@@ -52,7 +53,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
52 53
53 ## End configuration options 54 ## End configuration options
54 ############################ 55 ############################
55@@ -677,9 +689,10 @@ 56@@ -678,9 +683,10 @@ HOSTNAME= -DALWAYS_HOSTNAME
56 # Protection against weird shells or weird make programs. 57 # Protection against weird shells or weird make programs.
57 58
58 SHELL = /bin/sh 59 SHELL = /bin/sh
@@ -65,7 +66,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
65 $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ 66 $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
66 -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ 67 -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
67 -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ 68 -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
68@@ -712,10 +725,11 @@ 69@@ -713,11 +719,12 @@ all other: config-check tcpd tcpdmatch t
69 70
70 config-check: 71 config-check:
71 @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; } 72 @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; }
@@ -81,3 +82,4 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
81+ @if [ ! -d shared ]; then mkdir shared; fi 82+ @if [ ! -d shared ]; then mkdir shared; fi
82 83
83 $(LIB): $(LIB_OBJ) 84 $(LIB): $(LIB_OBJ)
85 rm -f $(LIB)