From 0959b42e4de8fc0887fa8950f6b10fa2cadb8df4 Mon Sep 17 00:00:00 2001
From: Sebastian Knapp <rock@ccls-online.de>
Date: Sat, 28 Mar 2009 18:04:14 +0000
Subject: [PATCH] giftnuss:     * only one file is a Makefile patch
 (config.patch)     * use correct ranlib binary in crossbuild, should not hurt
 normal builds

[2009030815135123689] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9416 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/tcp_wrappers/config.patch       | 21 ++++++++---
 package/base/tcp_wrappers/setenv_glibc.patch | 39 --------------------
 package/base/tcp_wrappers/tcp_wrappers.conf  |  2 +-
 3 files changed, 17 insertions(+), 45 deletions(-)
 delete mode 100644 package/base/tcp_wrappers/setenv_glibc.patch

diff --git a/package/base/tcp_wrappers/config.patch b/package/base/tcp_wrappers/config.patch
index b56959ce7..fe0abe465 100644
--- a/package/base/tcp_wrappers/config.patch
+++ b/package/base/tcp_wrappers/config.patch
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/base/tcp_wrappers/config.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2009 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
@@ -17,8 +17,8 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
---- ./Makefile.orig	Fri Mar 21 19:27:21 1997
-+++ ./Makefile	Fri Apr 23 11:02:43 1999
+--- ./Makefile.orig	2009-03-08 13:59:57.000000000 +0000
++++ ./Makefile	2009-03-08 14:34:23.000000000 +0000
 @@ -44,7 +44,7 @@
  #REAL_DAEMON_DIR=/usr/etc
  #
@@ -28,15 +28,26 @@
  #
  # BSD 4.4
  #REAL_DAEMON_DIR=/usr/libexec
-@@ -144,7 +144,7 @@
+@@ -143,8 +143,8 @@
+ 
  linux:
  	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
- 	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
+-	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
 -	NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all
++	LIBS= RANLIB=$(RANLIB) ARFLAGS=rv AUX_OBJ= \
 +	NETGROUP= TLI= EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER" all
  
  # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
  hpux hpux8 hpux9 hpux10:
+@@ -391,7 +391,7 @@
+ # the ones provided with this source distribution. The environ.c module
+ # implements setenv(), getenv(), and putenv().
+ 
+-AUX_OBJ= setenv.o
++#AUX_OBJ= setenv.o
+ #AUX_OBJ= environ.o
+ #AUX_OBJ= environ.o strcasecmp.o
+ 
 @@ -491,7 +491,7 @@
  # Uncomment the next definition to turn on the language extensions
  # (examples: allow, deny, banners, twist and spawn).
diff --git a/package/base/tcp_wrappers/setenv_glibc.patch b/package/base/tcp_wrappers/setenv_glibc.patch
deleted file mode 100644
index 028cef05a..000000000
--- a/package/base/tcp_wrappers/setenv_glibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/tcp_wrappers/setenv_glibc.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./Makefile
-+++ ./Makefile
-@@ -143,7 +143,7 @@
- 
- linux:
- 	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
--	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
-+	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= \
- 	NETGROUP= TLI= EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER" all
- 
- # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
-@@ -391,7 +391,7 @@
- # the ones provided with this source distribution. The environ.c module
- # implements setenv(), getenv(), and putenv().
- 
--AUX_OBJ= setenv.o
-+#AUX_OBJ= setenv.o
- #AUX_OBJ= environ.o
- #AUX_OBJ= environ.o strcasecmp.o
- 
diff --git a/package/base/tcp_wrappers/tcp_wrappers.conf b/package/base/tcp_wrappers/tcp_wrappers.conf
index 750617348..dac0a513f 100644
--- a/package/base/tcp_wrappers/tcp_wrappers.conf
+++ b/package/base/tcp_wrappers/tcp_wrappers.conf
@@ -32,7 +32,7 @@ tcpw_pm() {
 	install -m755 safe_finger tcpd tcpdchk tcpdmatch try-from $sbindir
 }
 
-var_append makeopt " " "linux"
+var_append makeopt " " "RANLIB=$RANLIB linux"
 makeinstopt=""
 
 hook_add postmake 3 "tcpw_pm"