Changeset 2198 for branches/fc17-dev/server/fedora
- Timestamp:
- May 23, 2012, 12:48:29 AM (13 years ago)
- Location:
- branches/fc17-dev/server/fedora/specs
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/fc17-dev/server/fedora/specs/httpd.spec.patch
r2195 r2198 1 --- httpd.spec.~1~ 2012-0 2-13 09:46:36.000000000 -05002 +++ httpd.spec 2012-0 3-26 01:33:53.247271289-04003 @@ - 8,7 +8,7 @@1 --- httpd.spec.~1~ 2012-04-30 05:52:31.000000000 -0400 2 +++ httpd.spec 2012-05-22 23:31:12.397142763 -0400 3 @@ -9,7 +9,7 @@ 4 4 Summary: Apache HTTP Server 5 5 Name: httpd 6 6 Version: 2.2.22 7 -Release: 1%{?dist}8 +Release: 1%{?dist}.scripts.%{scriptsversion}7 -Release: 4%{?dist} 8 +Release: 4%{?dist}.scripts.%{scriptsversion} 9 9 URL: http://httpd.apache.org/ 10 10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 11 11 Source1: index.html 12 @@ -5 4,6 +54,15 @@13 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}14 Requires : httpd-tools = %{version}-%{release}, apr-util-ldap,systemd-units12 @@ -58,6 +58,15 @@ 13 Requires(postun): systemd-units 14 Requires(post): systemd-units 15 15 16 16 +Provides: scripts-httpd = %{version}-%{release} … … 26 26 The Apache HTTP Server is a powerful, efficient, and extensible 27 27 web server. 28 @@ -6 4,6 +76,7 @@28 @@ -68,6 +77,7 @@ 29 29 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel 30 30 Requires: apr-devel, apr-util-devel, pkgconfig … … 34 34 %description devel 35 35 The httpd-devel package contains the APXS binary and other files 36 @@ -10 2,6 +115,7 @@36 @@ -106,6 +116,7 @@ 37 37 Requires(post): openssl, /bin/cat 38 38 Requires(pre): httpd … … 42 42 43 43 %description -n mod_ssl 44 @@ -11 0,6 +124,11 @@44 @@ -114,6 +125,11 @@ 45 45 Security (TLS) protocols. 46 46 … … 54 54 %patch1 -p1 -b .apctl 55 55 %patch2 -p1 -b .apxs 56 @@ -1 28,6 +147,14 @@56 @@ -133,6 +149,14 @@ 57 57 # Patch in vendor/release string 58 58 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 … … 69 69 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 70 70 if test "x${vmmn}" != "x%{mmn}"; then 71 @@ -1 75,10 +205,12 @@71 @@ -193,10 +217,12 @@ 72 72 --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ 73 73 --enable-suexec --with-suexec \ -
branches/fc17-dev/server/fedora/specs/krb5.spec.patch
r2195 r2198 1 --- krb5.spec.~1~ 2012-03-08 16:2 0:41.000000000 -05002 +++ krb5.spec 2012-0 4-01 22:07:14.834013302-04003 @@ - 6,7 +6,7 @@1 --- krb5.spec.~1~ 2012-03-08 16:26:28.000000000 -0500 2 +++ krb5.spec 2012-05-22 23:34:03.312147899 -0400 3 @@ -15,7 +15,7 @@ 4 4 Summary: The Kerberos network authentication system 5 5 Name: krb5 6 Version: 1. 9.37 -Release: 1%{?dist}8 +Release: 1%{?dist}.scripts.%{scriptsversion}6 Version: 1.10 7 -Release: 5%{?dist} 8 +Release: 5%{?dist}.scripts.%{scriptsversion} 9 9 # Maybe we should explode from the now-available-to-everybody tarball instead? 10 # http://web.mit.edu/kerberos/dist/krb5/1. 9/krb5-1.9.3-signed.tar10 # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10-signed.tar 11 11 Source0: krb5-%{version}.tar.gz 12 @@ -6 4,6 +64,8 @@13 Patch10 2: krb5-1.9-7048.patch14 Patch10 3: krb5-kvno-230379.patch12 @@ -66,6 +66,8 @@ 13 Patch106: krb5-1.10-lookaside.patch 14 Patch107: krb5-1.10-string-rpc-acl-fix.patch 15 15 16 16 +Patch1000: krb5-kuserok-scripts.patch … … 19 19 URL: http://web.mit.edu/kerberos/www/ 20 20 Group: System Environment/Libraries 21 @@ -11 3,6 +115,7 @@21 @@ -119,6 +121,7 @@ 22 22 %package libs 23 23 Summary: The shared libraries used by Kerberos 5 … … 27 27 %description libs 28 28 Kerberos is a network authentication system. The krb5-libs package 29 @@ -2 19,6 +222,7 @@30 %patch10 1 -p1 -b .704731 %patch10 2 -p1 -b .704832 %patch10 3 -p1 -b .kvno29 @@ -238,6 +241,7 @@ 30 %patch105 -p1 -b .kvno 31 %patch106 -p1 -b .7082 32 %patch107 -p1 -b .7093 33 33 +%patch1000 -p1 -b .kuserok 34 rm src/lib/krb5/krb/deltat.c 35 34 36 gzip doc/*.ps 35 36 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex -
branches/fc17-dev/server/fedora/specs/openssh.spec.patch
r2195 r2198 1 --- openssh.spec.~1~ 2012-0 2-14 11:06:13.000000000 -05002 +++ openssh.spec 2012-0 2-25 13:02:28.660616538 -05003 @@ - 78,7 +78,7 @@1 --- openssh.spec.~1~ 2012-04-06 15:22:23.000000000 -0400 2 +++ openssh.spec 2012-05-22 23:36:52.700142966 -0400 3 @@ -82,7 +82,7 @@ 4 4 Summary: An open source implementation of SSH protocol versions 1 and 2 5 5 Name: openssh … … 10 10 #URL1: http://pamsshagentauth.sourceforge.net 11 11 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz 12 @@ - 92,6 +92,7 @@13 Source3: sshd.init14 Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz215 Source5: pam_ssh_agent-rmheaders12 @@ -218,6 +218,7 @@ 13 #https://bugzilla.mindrot.org/show_bug.cgi?id=1604 14 # sctp 15 #https://bugzilla.mindrot.org/show_bug.cgi?id=1873 => https://bugzilla.redhat.com/show_bug.cgi?id=668993 16 16 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch 17 17 18 Patch100: openssh-5.6p1-wIm.patch19 Patch0: openssh-5.6p1-redhat.patch20 @@ -2 14,6 +215,7 @@21 Requires(pre): /usr/sbin/useradd22 Requires: pam >= 1.0.1-318 License: BSD 19 Group: Applications/Internet 20 @@ -271,6 +272,7 @@ 21 Group: Applications/Internet 22 Requires: openssh = %{version}-%{release} 23 23 Requires: fipscheck-lib%{_isa} >= 1.3.0 24 24 +Provides: scripts-openssh-server 25 25 26 % if %{ldap}27 %package ldap28 @@ - 333,6 +335,8 @@29 %patch83 -p0 -b .oomkiller30 % patch84 -p1 -b .legacy26 %package server 27 Summary: An open source SSH server daemon 28 @@ -465,6 +467,8 @@ 29 # Nothing here yet 30 %endif 31 31 32 32 +%patch1001 -p1 -b .gssapi-env -
branches/fc17-dev/server/fedora/specs/php.spec.patch
r2195 r2198 1 --- php.spec.~1~ 2012-0 2-02 17:13:59.000000000 -05002 +++ php.spec 2012-05- 03 14:18:22.234721036 -04003 @@ - 37,7 +37,7 @@1 --- php.spec.~1~ 2012-04-27 13:42:25.000000000 -0400 2 +++ php.spec 2012-05-22 23:38:56.360148746 -0400 3 @@ -56,7 +56,7 @@ 4 4 Summary: PHP scripting language for creating dynamic web sites 5 5 Name: php 6 Version: 5. 3.106 Version: 5.4.1 7 7 -Release: 1%{?dist} 8 8 +Release: 1%{?dist}.scripts.%{scriptsversion} … … 10 10 Group: Development/Languages 11 11 URL: http://www.php.net/ 12 @@ - 76,6 +76,9 @@12 @@ -91,6 +91,9 @@ 13 13 # Fixes for tests 14 Patch61: php-5.0.4-tests-wddx.patch14 15 15 16 16 +Provides: scripts-php … … 19 19 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 20 20 21 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel22 @@ -5 44,6 +547,8 @@23 24 % patch61 -p1 -b .tests-wddx21 BuildRequires: bzip2-devel, curl-devel >= 7.9, %{db_devel}, gmp-devel 22 @@ -584,6 +587,8 @@ 23 %patch44 -p1 -b .systzip 24 %endif 25 25 26 26 +%patch100 -p0 -b .cve-2012-1823 -
branches/fc17-dev/server/fedora/specs/redland-bindings.spec.patch
r2066 r2198 1 --- redland-bindings.spec. old 2011-10-12 14:51:58.000000000 -04002 +++ redland-bindings.spec 201 1-10-13 10:15:24.000000000-04001 --- redland-bindings.spec.~1~ 2012-03-06 07:34:14.000000000 -0500 2 +++ redland-bindings.spec 2012-05-22 23:43:49.839142648 -0400 3 3 @@ -1,6 +1,6 @@ 4 4 Name: redland-bindings 5 Version: 1.0.1 1.16 -Release: 6%{?dist}7 +Release: 6%{?dist}.scripts.%{scriptsversion}5 Version: 1.0.14.1 6 -Release: 1%{?dist} 7 +Release: 1%{?dist}.scripts.%{scriptsversion} 8 8 Summary: Redland RDF Application Framework API Bindings 9 9 10 10 Group: System Environment/Libraries 11 @@ -13 7,6 +137,9@@12 autoconf13 automake11 @@ -130,6 +130,8 @@ 12 #autoconf 13 #automake 14 14 15 15 +# Horrible hack to make PHP work 16 16 +sed -i -e 's/zend_error_noreturn/zend_error/' php/* 17 + 18 # when specifying system redland, the configure check for the version 19 # allows newer redland libraries; without it it doesn't. 20 # authors says that older bindings work with newer redlands. 17 18 %build 19 %configure \ -
branches/fc17-dev/server/fedora/specs/rubygems.spec.patch
r2195 r2198 1 --- rubygems.spec.~1~ 2012-04-2 0 14:46:27.000000000 -04002 +++ rubygems.spec 2012-05- 03 14:12:52.421863447-04003 @@ -1 5,7 +15,7 @@1 --- rubygems.spec.~1~ 2012-04-28 04:01:50.000000000 -0400 2 +++ rubygems.spec 2012-05-22 23:47:16.001145101 -0400 3 @@ -18,7 +18,7 @@ 4 4 Summary: The Ruby standard for packaging ruby libraries 5 5 Name: rubygems 6 Version: 1. 7.27 -Release: 5%{?dist}8 +Release: 5%{?dist}.scripts.%{scriptsversion}6 Version: 1.8.24 7 -Release: 1%{?dist} 8 +Release: 1%{?dist}.scripts.%{scriptsversion} 9 9 Group: Development/Libraries 10 # No GPL version is specified.11 License: Ruby or GPL+12 @@ - 42,6 +42,9@@13 # Insecure connection to SSL repository fix14 Patch10 : rubygems-1.x.x-ssl-connection-don_t-revert.patch10 License: Ruby or MIT 11 12 @@ -52,6 +52,8 @@ 13 # https://github.com/rubygems/rubygems/issues/210 14 Patch109: rubygems-1.8.11-binary-extensions.patch 15 15 16 16 +Provides: scripts-rubygems = %{version}-%{release} 17 17 +Patch1000: rubygems-rails-require-thread.patch 18 + 19 Requires: ruby(abi) = 1.8 20 Requires: ruby >= 1.8.7 21 Requires: ruby-rdoc 22 @@ -83,6 +86,8 @@ 23 %patch7 -p1 -b .esc.skip 24 %patch10 -p1 -b .ssl 18 19 Requires: ruby(abi) = 1.9.1 20 Requires: rubygem(rdoc) >= 3.9.4 21 @@ -97,6 +99,8 @@ 22 %patch105 -p1 -b .uninst 23 %patch109 -p1 -b .bindir 25 24 26 25 +%patch1000 -p1 -b .thread
Note: See TracChangeset
for help on using the changeset viewer.