From 2e7f59d4777e594369bf1ab0d58ada0cdca6337edea2dc96eeb9752ad5b275f9 Mon Sep 17 00:00:00 2001
From: OBS User mrdocs <null@suse.de>
Date: Sun, 4 Jun 2017 00:46:26 +0000
Subject: [PATCH] Accepting request 500818 from
 home:msmeissn:branches:network:utilities

- tcp_wrappers_7.6-optflags.diff: enable PIE for all binaries
  directly.

OBS-URL: https://build.opensuse.org/request/show/500818
OBS-URL: https://build.opensuse.org/package/show/network:utilities/tcpd?expand=0&rev=27
---
 tcp_wrappers_7.6-optflags.diff | 24 +++++++++++++++++-------
 tcpd.changes                   |  6 ++++++
 tcpd.spec                      |  2 +-
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/tcp_wrappers_7.6-optflags.diff b/tcp_wrappers_7.6-optflags.diff
index 9d9d72d..9ff578a 100644
--- a/tcp_wrappers_7.6-optflags.diff
+++ b/tcp_wrappers_7.6-optflags.diff
@@ -1,3 +1,5 @@
+Index: Makefile
+===================================================================
 --- Makefile.orig
 +++ Makefile
 @@ -673,7 +673,7 @@ SHLIBFLAGS = -Lshared -lwrap
@@ -9,28 +11,36 @@
  	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
  	-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
  	-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
-@@ -730,13 +730,13 @@ $(SHLIB): $(SHLIB_OBJ)
+@@ -730,26 +730,26 @@ $(SHLIB): $(SHLIB_OBJ)
  	ln -s $(notdir $(SHLIBSOMAJ)) $(SHLIBSO)
  
  tcpd:	tcpd.o $(SHLIB)
 -	$(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS)
-+	$(CC) $(CFLAGS) -pie -o $@ tcpd.o $(SHLIBFLAGS)
++	$(CC) -pie -o $@ tcpd.o $(SHLIBFLAGS)
  
  miscd:	miscd.o $(SHLIB)
- 	$(CC) $(CFLAGS) -o $@ miscd.o $(SHLIBFLAGS)
+-	$(CC) $(CFLAGS) -o $@ miscd.o $(SHLIBFLAGS)
++	$(CC) -pie -o $@ miscd.o $(SHLIBFLAGS)
  
  safe_finger: safe_finger.o $(SHLIB)
 -	$(CC) $(CFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS)
-+	$(CC) $(CFLAGS) -pie -o $@ safe_finger.o $(SHLIBFLAGS)
++	$(CC) -pie -o $@ safe_finger.o $(SHLIBFLAGS)
  
  TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o
  
-@@ -744,7 +744,7 @@ tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB)
- 	$(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
+ tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB)
+-	$(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
++	$(CC) -pie -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
  
  try-from: try-from.o fakelog.o $(SHLIB)
 -	$(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS)
-+	$(CC) $(CFLAGS) -pie -o $@ try-from.o fakelog.o $(SHLIBFLAGS)
++	$(CC) -pie -o $@ try-from.o fakelog.o $(SHLIBFLAGS)
  
  TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o
  
+ tcpdchk: $(TCPDCHK_OBJ) $(SHLIB)
+-	$(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS)
++	$(CC) -pie -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS)
+ 
+ shar:	$(KIT)
+ 	@shar $(KIT)
diff --git a/tcpd.changes b/tcpd.changes
index 8602e82..b0d2897 100644
--- a/tcpd.changes
+++ b/tcpd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jun  3 08:36:59 UTC 2017 - meissner@suse.com
+
+- tcp_wrappers_7.6-optflags.diff: enable PIE for all binaries
+  directly.
+
 -------------------------------------------------------------------
 Wed Apr  6 10:35:38 CEST 2016 - kukuk@suse.de
 
diff --git a/tcpd.spec b/tcpd.spec
index 0cf0182..e7ce927 100644
--- a/tcpd.spec
+++ b/tcpd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tcpd
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed