build regress/modpipe tests with $(CFLAGS)

This commit is contained in:
Petr Lautrbach 2013-04-04 16:20:45 +02:00
parent 8a29dedfa7
commit 8d97022c57
2 changed files with 17 additions and 0 deletions

View File

@ -0,0 +1,12 @@
diff -up openssh-6.2p1/Makefile.in.modpipe-pie openssh-6.2p1/Makefile.in
--- openssh-6.2p1/Makefile.in.modpipe-pie 2013-04-04 14:44:26.293745777 +0200
+++ openssh-6.2p1/Makefile.in 2013-04-04 14:44:49.483647020 +0200
@@ -418,7 +418,7 @@ uninstall:
regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
[ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
- $(CC) $(CPPFLAGS) -o $@ $? \
+ $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $? \
$(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT)

View File

@ -212,6 +212,10 @@ Patch903: openssh-6.1p1-required-authentications.patch
# change default value of MaxStartups - CVE-2010-5107 - #908707 # change default value of MaxStartups - CVE-2010-5107 - #908707
Patch904: openssh-6.1p1-change-max-startups.patch Patch904: openssh-6.1p1-change-max-startups.patch
# build regress/modpipe tests with $(CFLAGS), based on
# http://lists.mindrot.org/pipermail/openssh-unix-dev/2013-March/031167.html
Patch905: openssh-6.2p1-modpipe-cflags.patch
#--- #---
#https://bugzilla.mindrot.org/show_bug.cgi?id=1604 #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
# sctp # sctp
@ -458,6 +462,7 @@ popd
# %patch902 -p1 -b .man-moduli # %patch902 -p1 -b .man-moduli
# %patch903 -p1 -b .required-authentication # %patch903 -p1 -b .required-authentication
# %patch904 -p1 -b .max-startups # %patch904 -p1 -b .max-startups
%patch905 -p1 -b .modpipe-cflags
%if 0 %if 0
# Nothing here yet # Nothing here yet