rpms/subversion/devel subversion-1.6.0-deplibs.patch, NONE, 1.1 subversion-1.6.0-pie.patch, NONE, 1.1 subversion-1.6.0-rpath.patch, NONE, 1.1 subversion-1.6.0.tar.gz.asc, NONE, 1.1 .cvsignore, 1.29, 1.30 sources, 1.36, 1.37 subversion.conf, 1.7, 1.8 subversion.spec, 1.135, 1.136 upstream, 1.22, 1.23 subversion-0.20.1-deplibs.patch, 1.1, NONE subversion-1.5.1-rpath.patch, 1.2, NONE subversion-1.5.2-pie.patch, 1.1, NONE subversion-1.5.6-lt22.patch, 1.1, NONE

Joe Orton jorton at fedoraproject.org
Tue Mar 31 16:16:11 UTC 2009 

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5680

Modified Files:
	.cvsignore sources subversion.conf subversion.spec upstream 
Added Files:
	subversion-1.6.0-deplibs.patch subversion-1.6.0-pie.patch 
	subversion-1.6.0-rpath.patch subversion-1.6.0.tar.gz.asc 
Removed Files:
	subversion-0.20.1-deplibs.patch subversion-1.5.1-rpath.patch 
	subversion-1.5.2-pie.patch subversion-1.5.6-lt22.patch 
Log Message:
* Tue Mar 31 2009 Joe Orton <jorton at redhat.com> 1.6.0-1
- update to 1.6.0


subversion-1.6.0-deplibs.patch:

--- NEW FILE subversion-1.6.0-deplibs.patch ---
--- subversion-1.6.0/build/ac-macros/apr.m4.deplibs
+++ subversion-1.6.0/build/ac-macros/apr.m4
@@ -76,9 +76,9 @@ AC_DEFUN(SVN_LIB_APR,
 
   dnl When APR stores the dependent libs in the .la file, we don't need 
   dnl --libs.
-  SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
+  SVN_APR_LIBS="`$apr_config --link-libtool`"
   if test $? -ne 0; then
-    AC_MSG_ERROR([apr-config --link-libtool --libs failed])
+    AC_MSG_ERROR([apr-config --link-libtool failed])
   fi
 
   SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
--- subversion-1.6.0/build/ac-macros/aprutil.m4.deplibs
+++ subversion-1.6.0/build/ac-macros/aprutil.m4
@@ -77,11 +77,9 @@ AC_DEFUN(SVN_LIB_APRUTIL,
     AC_MSG_ERROR([apu-config --prefix failed])
   fi
 
-  dnl When APR stores the dependent libs in the .la file, we don't need
-  dnl --libs.
-  SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
+  SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
   if test $? -ne 0; then
-    AC_MSG_ERROR([apu-config --link-libtool --libs failed])
+    AC_MSG_ERROR([apu-config --link-libtool failed])
   fi
 
   SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"

subversion-1.6.0-pie.patch:

--- NEW FILE subversion-1.6.0-pie.patch ---
--- subversion-1.6.0/build.conf.pie
+++ subversion-1.6.0/build.conf
@@ -472,7 +472,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)
@@ -495,7 +495,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.6.0/build/generator/gen_base.py.pie
+++ subversion-1.6.0/build/generator/gen_base.py
@@ -413,6 +413,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)
 
@@ -455,8 +458,11 @@ class TargetLib(TargetLinked):
     self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
     self.msvc_export = options.get('msvc-export', '').split()
 
-    ### 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.6.0/Makefile.in.pie
+++ subversion-1.6.0/Makefile.in
@@ -184,8 +185,11 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
 COMPILE_JAVAHL_JAVAH = $(JAVAH)
 
-LINK_LIB = $(LINK) -rpath $(libdir)
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -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)
 LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
 
 # special link rule for mod_dav_svn

subversion-1.6.0-rpath.patch:

--- NEW FILE subversion-1.6.0-rpath.patch ---

Libraries should be linked with -rpath $libdir but programs should not.
Doing so for the latter means that a redundant RPATH entry of $libdir
will end up in the binaries.

The redundant RPATH can also cause obscure build failures by causing
in-build binaries to pick up libraries from the system environment,
which libtool will otherwise avoid.

--- subversion-1.6.0/build/generator/gen_base.py.rpath
+++ subversion-1.6.0/build/generator/gen_base.py
@@ -455,6 +455,9 @@ class TargetLib(TargetLinked):
     self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
     self.msvc_export = options.get('msvc-export', '').split()
 
+    ### hmm. this is Makefile-specific
+    self.link_cmd = '$(LINK_LIB)'
+
 class TargetApacheMod(TargetLib):
 
   def __init__(self, name, options, gen_obj):
--- subversion-1.6.0/Makefile.in.rpath
+++ subversion-1.6.0/Makefile.in
@@ -184,6 +184,7 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
 COMPILE_JAVAHL_JAVAH = $(JAVAH)
 
+LINK_LIB = $(LINK) -rpath $(libdir)
 LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
 LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
 


--- NEW FILE subversion-1.6.0.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAknClnUACgkQCwOubk4kUXzzrwCeP6g1IJ5tC/dcTaSon+AFeH0V
zNYAoKY0ZhzX0oLmSdNDeZb5IbE0/BMl
=cV+A
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)

iEYEABECAAYFAknCqHAACgkQ/P1jBZgh97LYHQCdFFNSRiPWNFaHf00fzTUJRVHI
ZdwAn0SIV4WEu2ek8PWYjY9Dfs1SOgEo
=DXbN
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAknCqzUACgkQokEGqRcG/W6M6wCcDH7uBuRCRRSp/MozjJJ+P1RZ
l0sAn2pLD/nyYTKMofWAG1Ce5B6rAWMg
=rhHR
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAknDRyEACgkQvJ27E9sAokjuQACfSPnJdzy7XV9PuFTl7y9R4nCV
fawAnjZdVWUBYwi6boWYlltmxHPDVk1O
=LYDm
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	9 Mar 2009 14:03:54 -0000	1.29
+++ .cvsignore	31 Mar 2009 16:15:40 -0000	1.30
@@ -1 +1 @@
-subversion-1.5.6.tar.gz
+subversion-1.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	9 Mar 2009 14:03:55 -0000	1.36
+++ sources	31 Mar 2009 16:15:40 -0000	1.37
@@ -1 +1 @@
-ad81e54058e64b5d399d3eda5f8bfcd1  subversion-1.5.6.tar.gz
+b74985c9191d4a652a9f618a06171880  subversion-1.6.0.tar.gz


Index: subversion.conf
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- subversion.conf	8 Sep 2005 15:49:25 -0000	1.7
+++ subversion.conf	31 Mar 2009 16:15:40 -0000	1.8
@@ -5,11 +5,12 @@
 #
 # Example configuration to enable HTTP access for a directory
 # containing Subversion repositories, "/var/www/svn".  Each repository
-# must be readable and writable by the 'apache' user.  Note that if
-# SELinux is enabled, the repositories must be labelled with a context
-# which httpd can write to; this will happen by default for
-# directories created in /var/www.  Use "restorecon -R /var/www/svn"
-# to label the repositories if upgrading from a previous release.
+# must be both:
+#
+#   a) readable and writable by the 'apache' user, and
+#
+#   b) labelled with the 'http_sys_content_rw_t' context if using
+#   SELinux
 #
 
 #
@@ -19,6 +20,7 @@
 #   # cd /var/www/svn
 #   # svnadmin create stuff   
 #   # chown -R apache.apache stuff
+#   # chcon -R -t -t http_sys_content_rw_t stuff
 #
 
 #<Location /repos>


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- subversion.spec	14 Mar 2009 04:28:16 -0000	1.135
+++ subversion.spec	31 Mar 2009 16:15:40 -0000	1.136
@@ -14,8 +14,8 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.5.6
-Release: 4
+Version: 1.6.0
+Release: 2
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -24,10 +24,9 @@
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
 Source5: psvn-init.el
-Patch1: subversion-1.5.6-lt22.patch
-Patch2: subversion-0.20.1-deplibs.patch
-Patch3: subversion-1.5.1-rpath.patch
-Patch6: subversion-1.5.2-pie.patch
+Patch2: subversion-1.6.0-deplibs.patch
+Patch3: subversion-1.6.0-rpath.patch
+Patch6: subversion-1.6.0-pie.patch
 Patch7: subversion-1.1.3-java.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
@@ -105,7 +104,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .lt22
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .rpath
 %patch6 -p1 -b .pie
@@ -130,7 +128,7 @@
 export svn_cv_ruby_sitedir_libsuffix=""
 export svn_cv_ruby_sitedir_archsuffix=""
 
-export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
+export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS -fPIE"
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --with-swig --with-neon=%{_prefix} \
         --with-ruby-sitedir=%{ruby_sitearch} \
@@ -287,6 +285,9 @@
 %endif
 
 %changelog
+* Tue Mar 31 2009 Joe Orton <jorton at redhat.com> 1.6.0-1
+- update to 1.6.0
+
 * Thu Mar 12 2009 Dennis Gilmore <dennis at ausil.us> - 1.5.6-4
 - use -fPIE on sparc64
 


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/upstream,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- upstream	9 Mar 2009 14:03:55 -0000	1.22
+++ upstream	31 Mar 2009 16:15:40 -0000	1.23
@@ -1 +1 @@
-subversion-1.5.6.tar.gz
+subversion-1.6.0.tar.gz


--- subversion-0.20.1-deplibs.patch DELETED ---


--- subversion-1.5.1-rpath.patch DELETED ---


--- subversion-1.5.2-pie.patch DELETED ---


--- subversion-1.5.6-lt22.patch DELETED ---

More information about the fedora-extras-commits mailing list