testing/tcpd
SHA256
3
0
Fork 0
forked from pool/tcpd
Code Pull Requests Activity

Accepting request 500899 from network:utilities

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/500899
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcpd?expand=0&rev=29
This commit is contained in:
Dominique Leuenberger 2017-06-08 14:09:28 +00:00 committed by Git OBS Bridge
commit 5ec35fb908
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tcp_wrappers_7.6-optflags.diff
View File

@ -1,3 +1,5 @@
Index: Makefile
===================================================================
--- Makefile.orig --- Makefile.orig
+++ Makefile +++ Makefile
@@ -673,7 +673,7 @@ SHLIBFLAGS = -Lshared -lwrap @@ -673,7 +673,7 @@ SHLIBFLAGS = -Lshared -lwrap
@ -9,28 +11,36 @@
$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ -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) ln -s $(notdir $(SHLIBSOMAJ)) $(SHLIBSO)
tcpd: tcpd.o $(SHLIB) tcpd: tcpd.o $(SHLIB)
- $(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS) - $(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS)
+ $(CC) $(CFLAGS) -pie -o $@ tcpd.o $(SHLIBFLAGS) + $(CC) -pie -o $@ tcpd.o $(SHLIBFLAGS)
miscd: miscd.o $(SHLIB) 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) safe_finger: safe_finger.o $(SHLIB)
- $(CC) $(CFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS) - $(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 TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o
@@ -744,7 +744,7 @@ tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB) tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB)
$(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS) - $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
+ $(CC) -pie -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
try-from: try-from.o fakelog.o $(SHLIB) try-from: try-from.o fakelog.o $(SHLIB)
- $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS) - $(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_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)

6
tcpd.changes
View File

@ -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 Wed Apr 6 10:35:38 CEST 2016 - kukuk@suse.de

2
tcpd.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package tcpd # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed