rpms/subversion/devel subversion-1.5.2-pie.patch, NONE, 1.1 subversion.spec, 1.122, 1.123 subversion-1.5.0-pie.patch, 1.1, NONE
Joe Orton
jorton at fedoraproject.org
Tue Sep 30 11:58:18 UTC 2008
- Previous message (by thread): comps comps-f10.xml.in,1.123,1.124
- Next message (by thread): rpms/iscsi-initiator-utils/devel iscsi-initiator-utils-idbm-lock-error-handling.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 iscsi-initiator-utils-ibft-sysfs.patch, 1.1, 1.2 iscsi-initiator-utils-update-initscripts-and-docs.patch, 1.3, 1.4 iscsi-initiator-utils-use-var-for-config.patch, 1.5, 1.6 iscsi-initiator-utils.spec, 1.32, 1.33 iscsid.init, 1.5, 1.6 iscsidevs.init, 1.5, 1.6 sources, 1.15, 1.16 iscsi-initiator-utils-Fix-connection-cleanup-when-iscsid-is-restarted.patch, 1.1, NONE iscsi-initiator-utils-add-fw-login.patch, 1.1, NONE iscsi-initiator-utils-add-iscsi-iname.patch, 1.1, NONE iscsi-initiator-utils-fix-compile-err-include-limits.patch, 1.2, NONE iscsi-initiator-utils-fix-segment-len-check.patch, 1.1, NONE iscsi-initiator-utils-fix-sync-up.patch, 1.1, NONE iscsi-initiator-utils-handle-ipv6-compat-addrs.patch, 1.1, NONE iscsi-initiator-utils-update-startup-doc.patch, 1.1, NONE iscsi-initiator-utils-use-new-tpgt.patch, 1.1, NONE iscsi.init, 1.8, NONE iscsistart-static.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jorton
Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8452
Modified Files:
subversion.spec
Added Files:
subversion-1.5.2-pie.patch
Removed Files:
subversion-1.5.0-pie.patch
Log Message:
- fix for zero-fuzz
subversion-1.5.2-pie.patch:
--- NEW FILE subversion-1.5.2-pie.patch ---
--- subversion-1.5.2/build.conf.pie
+++ subversion-1.5.2/build.conf
@@ -452,7 +452,7 @@ type = swig_lib
lang = python
path = subversion/bindings/swig/python/libsvn_swig_py
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr
-link-cmd = $(LINK) $(SWIG_PY_LIBS)
+link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
install = swig-py-lib
# need special build rule to include -DSWIGPYTHON
compile-cmd = $(COMPILE_SWIG_PY)
@@ -475,7 +475,7 @@ type = swig_lib
lang = ruby
path = subversion/bindings/swig/ruby/libsvn_swig_ruby
libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
-link-cmd = $(LINK) $(SWIG_RB_LIBS)
+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
install = swig-rb-lib
# need special build rule to include
compile-cmd = $(COMPILE_SWIG_RB)
--- subversion-1.5.2/build/generator/gen_base.py.pie
+++ subversion-1.5.2/build/generator/gen_base.py
@@ -411,6 +411,9 @@ class TargetExe(TargetLinked):
self.manpages = options.get('manpages', '')
self.testing = options.get('testing')
+ if self.install == 'test' or self.install == 'bdb-test':
+ self.link_cmd = '$(LINK_TEST)'
+
def add_dependencies(self):
TargetLinked.add_dependencies(self)
@@ -453,8 +456,11 @@ class TargetLib(TargetLinked):
self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
self.msvc_export = string.split(options.get('msvc-export', ''))
- ### hmm. this is Makefile-specific
- self.link_cmd = '$(LINK_LIB)'
+ ### more Makefile-specific stuff:
+ if self.install == 'test':
+ self.link_cmd = '$(LINK_TEST_LIB)'
+ elif self.link_cmd == '$(LINK)':
+ self.link_cmd = '$(LINK_LIB)'
class TargetApacheMod(TargetLib):
--- subversion-1.5.2/Makefile.in.pie
+++ subversion-1.5.2/Makefile.in
@@ -2,7 +2,7 @@
# Makefile.in: template Makefile for Subversion
#
# ====================================================================
-# Copyright (c) 2000-2006 CollabNet. All rights reserved.
+# Copyright (c) 2000-2006, 2008 CollabNet. All rights reserved.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -151,9 +151,10 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
+BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
+COMPILE = $(BASE_COMPILE) -fpie
COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE)
# special compilation for files destined for mod_dav_svn
COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
@@ -168,8 +169,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
COMPILE_JAVAHL_JAVAH = $(JAVAH)
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-LINK_LIB = $(LINK) -rpath $(libdir)
+BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
+LINK = $(BASE_LINK) -pie
+LINK_TEST = $(BASE_LINK) -no-install
+LINK_LIB = $(BASE_LINK) -rpath $(libdir)
+LINK_TEST_LIB = $(BASE_LINK)
# special link rule for mod_dav_svn
LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- subversion.spec 30 Sep 2008 11:05:52 -0000 1.122
+++ subversion.spec 30 Sep 2008 11:57:47 -0000 1.123
@@ -25,7 +25,7 @@
Source4: http://www.xsteve.at/prg/emacs/psvn.el
Patch2: subversion-0.20.1-deplibs.patch
Patch3: subversion-1.5.1-rpath.patch
-Patch6: subversion-1.5.0-pie.patch
+Patch6: subversion-1.5.2-pie.patch
Patch7: subversion-1.1.3-java.patch
Patch8: subversion-1.5.0-perl510.patch
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
--- subversion-1.5.0-pie.patch DELETED ---
- Previous message (by thread): comps comps-f10.xml.in,1.123,1.124
- Next message (by thread): rpms/iscsi-initiator-utils/devel iscsi-initiator-utils-idbm-lock-error-handling.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 iscsi-initiator-utils-ibft-sysfs.patch, 1.1, 1.2 iscsi-initiator-utils-update-initscripts-and-docs.patch, 1.3, 1.4 iscsi-initiator-utils-use-var-for-config.patch, 1.5, 1.6 iscsi-initiator-utils.spec, 1.32, 1.33 iscsid.init, 1.5, 1.6 iscsidevs.init, 1.5, 1.6 sources, 1.15, 1.16 iscsi-initiator-utils-Fix-connection-cleanup-when-iscsid-is-restarted.patch, 1.1, NONE iscsi-initiator-utils-add-fw-login.patch, 1.1, NONE iscsi-initiator-utils-add-iscsi-iname.patch, 1.1, NONE iscsi-initiator-utils-fix-compile-err-include-limits.patch, 1.2, NONE iscsi-initiator-utils-fix-segment-len-check.patch, 1.1, NONE iscsi-initiator-utils-fix-sync-up.patch, 1.1, NONE iscsi-initiator-utils-handle-ipv6-compat-addrs.patch, 1.1, NONE iscsi-initiator-utils-update-startup-doc.patch, 1.1, NONE iscsi-initiator-utils-use-new-tpgt.patch, 1.1, NONE iscsi.init, 1.8, NONE iscsistart-static.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list