Changeset 1259 for trunk/server/fedora/specs
- Timestamp:
- Jul 9, 2009, 3:48:21 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property
svn:mergeinfo
set to
False
/branches/fc11-dev merged eligible
-
Property
svn:mergeinfo
set to
False
-
trunk/server/fedora/specs/httpd.spec.patch
r1035 r1259 1 --- httpd.spec.orig 2009-03- 28 13:32:47.000000000 -04002 +++ httpd.spec 2009-0 3-28 14:20:15.000000000 -04003 @@ - 6,7 +6,7 @@1 --- httpd.spec.orig 2009-03-17 09:12:22.000000000 -0400 2 +++ httpd.spec 2009-06-03 05:05:30.000000000 -0400 3 @@ -7,7 +7,7 @@ 4 4 Summary: Apache HTTP Server 5 5 Name: httpd 6 Version: 2.2.1 07 -Release: 1%{?dist}8 +Release: 1%{?dist}.scripts.%{scriptsversion}6 Version: 2.2.11 7 -Release: 8 8 +Release: 8.scripts.%{scriptsversion} 9 9 URL: http://httpd.apache.org/ 10 10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz 11 11 Source1: index.html 12 @@ -5 4,6 +54,12 @@12 @@ -56,6 +56,12 @@ 13 13 Conflicts: pcre < 4.0 14 Requires: httpd-tools = %{version}-%{release} 14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap 15 15 16 16 +Provides: scripts-httpd … … 23 23 The Apache HTTP Server is a powerful, efficient, and extensible 24 24 web server. 25 @@ -10 0,6 +106,7 @@25 @@ -102,6 +108,7 @@ 26 26 BuildRequires: openssl-devel, distcache-devel 27 27 Requires(post): openssl >= 0.9.7f-4, /bin/cat … … 31 31 32 32 %description -n mod_ssl 33 @@ -1 27,6 +134,11 @@33 @@ -130,6 +137,11 @@ 34 34 # Patch in vendor/release string 35 35 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 … … 43 43 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 44 44 if test "x${vmmn}" != "x%{mmn}"; then 45 @@ -17 5,10 +187,12 @@45 @@ -178,10 +190,12 @@ 46 46 --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ 47 47 --enable-suexec --with-suexec \ -
trunk/server/fedora/specs/krb5.spec.patch
r1069 r1259 1 --- krb5.spec.o ld 2009-04-08 06:26:23.000000000 -04002 +++ krb5.spec 2009-0 4-08 06:29:20.000000000 -04001 --- krb5.spec.orig 2009-04-07 15:17:07.000000000 -0400 2 +++ krb5.spec 2009-06-03 04:47:31.000000000 -0400 3 3 @@ -16,7 +16,7 @@ 4 4 Summary: The Kerberos network authentication system. 5 5 Name: krb5 6 6 Version: 1.6.3 7 -Release: 16%{?dist}8 +Release: 16%{?dist}.scripts.%{scriptsversion}7 -Release: 20%{?dist} 8 +Release: 20%{?dist}.scripts.%{scriptsversion} 9 9 # Maybe we should explode from the now-available-to-everybody tarball instead? 10 10 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar 11 11 Source0: krb5-%{version}.tar.gz 12 @@ -10 5,6 +105,8 @@13 Patch8 2: krb5-CVE-2009-0846.patch14 Patch8 3: krb5-CVE-2009-0847.patch12 @@ -106,6 +106,8 @@ 13 Patch83: krb5-CVE-2009-0846.patch 14 Patch84: krb5-CVE-2009-0847.patch 15 15 16 16 +Patch1000: krb5-kuserok-scripts.patch 17 17 + 18 License: MIT , freely distributable.18 License: MIT 19 19 URL: http://web.mit.edu/kerberos/www/ 20 20 Group: System Environment/Libraries 21 @@ -14 6,6 +148,7 @@21 @@ -147,6 +149,7 @@ 22 22 Group: System Environment/Libraries 23 23 Prereq: grep, /sbin/ldconfig, sh-utils … … 27 27 %description libs 28 28 Kerberos is a network authentication system. The krb5-libs package 29 @@ -1 389,6 +1392,7 @@30 %patch8 1-p1 -b .CVE-2009-0844-0845-231 %patch8 2-p1 -b .CVE-2009-084632 %patch8 3-p1 -b .CVE-2009-084729 @@ -1413,6 +1416,7 @@ 30 %patch82 -p1 -b .CVE-2009-0844-0845-2 31 %patch83 -p1 -b .CVE-2009-0846 32 %patch84 -p1 -b .CVE-2009-0847 33 33 +%patch1000 -p1 -b .kuserok 34 34 cp src/krb524/README README.krb524 -
trunk/server/fedora/specs/nss-ldapd.spec.patch
r1132 r1259 1 1 --- nss-ldapd.spec.orig 2009-03-30 04:33:50.000000000 -0400 2 +++ nss-ldapd.spec 2009-0 5-24 18:39:15.000000000 -04002 +++ nss-ldapd.spec 2009-06-03 03:18:49.000000000 -0400 3 3 @@ -19,18 +19,19 @@ 4 4 … … 55 55 %files 56 56 %defattr(-,root,root) 57 @@ -104, 11 +99,12@@57 @@ -104,7 +99,6 @@ 58 58 %doc %{_mandir}/man8/* 59 59 %config(noreplace) %attr(640,root,root) /etc/nss-ldapd.conf … … 63 63 /usr/sbin/nslcd 64 64 65 %changelog 66 +* Sun May 24 2009 Anders Kaseorg <andersk@mit.edu> - 0.6.8-2.1 67 +- Update for Fedora again. 68 * Wed Mar 25 2009 rhafer@suse.de 69 - Updated to 0.6.8: 70 * the nss-ldapd.conf was created world-readable which could cause 71 @@ -129,6 +125,10 @@ 65 @@ -129,6 +123,10 @@ 72 66 - Adjust config file permissions upon update, to fix world-readable 73 67 /etc/nss-ldapd.conf as created by older versions -
trunk/server/fedora/specs/openafs.spec.patch
r1079 r1259 1 --- openafs.spec.orig 2009-0 4-08 08:17:00.000000000 -04002 +++ openafs.spec 2009-0 4-14 04:32:44.000000000 -04001 --- openafs.spec.orig 2009-06-03 04:16:03.000000000 -0400 2 +++ openafs.spec 2009-06-12 02:05:57.000000000 -0400 3 3 @@ -8,7 +8,7 @@ 4 4 # for beta/rc releases make pkgrel 0.X.<tag> … … 10 10 %if %{?osvers:0}%{!?osvers:1} 11 11 %define osvers 1 12 @@ -261,6 +261,1 1@@12 @@ -261,6 +261,14 @@ 13 13 %endif 14 14 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 … … 18 18 +Patch1002: openafs-pts-encrypt.patch 19 19 +Patch1003: openafs-localcsdb.patch 20 +Patch1004: openafs-delta-dprintf-rename-20090427.patch 21 +Patch1005: openafs-numsysnames.patch 22 +Patch1006: openafs-delta-linux26-defer-cred-changing-20090511.patch 20 23 + 21 24 # http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... 22 25 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 23 26 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 24 @@ -343,6 +3 48,7 @@27 @@ -343,6 +351,7 @@ 25 28 %if %{build_userspace} 26 29 … … 30 33 31 34 %if %{fedorakmod} 32 @@ -403,6 +4 09,7 @@35 @@ -403,6 +412,7 @@ 33 36 34 37 %if %{build_authlibs} … … 38 41 Group: Networking/Filesystems 39 42 40 @@ -419,6 +42 6,7 @@43 @@ -419,6 +429,7 @@ 41 44 %endif 42 45 … … 46 49 Requires: openafs-authlibs = %{PACKAGE_VERSION} 47 50 %endif 48 @@ -437,6 +44 5,7 @@51 @@ -437,6 +448,7 @@ 49 52 libraries. 50 53 … … 54 57 Group: Development/Filesystems 55 58 56 @@ -465,6 +47 4,7 @@59 @@ -465,6 +477,7 @@ 57 60 administrators. 58 61 … … 62 65 Group: Networking/Filesystems 63 66 Provides: openafs-kernel = %{PACKAGE_VERSION} 64 @@ -514,6 +52 4,7 @@67 @@ -514,6 +527,7 @@ 65 68 66 69 %if %{krb5support} … … 70 73 Requires: openafs = %{PACKAGE_VERSION} 71 74 Group: Networking/Filesystems 72 @@ -540,7 +55 1,7 @@75 @@ -540,7 +554,7 @@ 73 76 %if %{build_modules} 74 77 … … 79 82 %else 80 83 81 @@ -699,6 +71 0,10@@84 @@ -699,6 +713,13 @@ 82 85 83 86 # Patch openafs to build a kernel module named "openafs" instead of "libafs" … … 87 90 +%patch1002 -p1 -b .pts-encrypt 88 91 +%patch1003 -p1 -b .localcsdb 92 +%patch1004 -p1 -b .dprintf 93 +%patch1005 -p1 -b .numsysnames 94 +%patch1006 -p1 -b .defercredchanging 89 95 90 96 ############################################################################## -
trunk/server/fedora/specs/openssh.spec.patch
r926 r1259 1 --- openssh.spec .orig 2009-01-01 21:06:01.000000000 -05002 +++ openssh.spec 2009-0 1-01 22:52:02.000000000 -05001 --- openssh.spec-pristine 2009-07-01 18:55:04.579034598 -0400 2 +++ openssh.spec 2009-07-01 18:49:33.068037580 -0400 3 3 @@ -63,7 +63,7 @@ 4 Summary: The OpenSSHimplementation of SSH protocol versions 1 and 24 Summary: An open source implementation of SSH protocol versions 1 and 2 5 5 Name: openssh 6 Version: 5. 1p17 -Release: 3%{?dist}%{?rescue_rel}8 +Release: 3%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}6 Version: 5.2p1 7 -Release: 2%{?dist}%{?rescue_rel} 8 +Release: 2%{?dist}%{?rescue_rel}.scripts.%{scriptsversion} 9 9 URL: http://www.openssh.com/portable.html 10 10 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz 11 11 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc 12 @@ -74,6 +74, 7@@12 @@ -74,6 +74,8 @@ 13 13 Source1: openssh-nukeacss.sh 14 14 Source2: sshd.pam 15 15 Source3: sshd.init 16 16 +Patch1000: openssh-5.0p1-multihomed.patch 17 Patch0: openssh-5.1p1-redhat.patch 17 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch 18 Patch0: openssh-5.2p1-redhat.patch 18 19 Patch2: openssh-5.1p1-skip-initial.patch 19 20 Patch3: openssh-3.8.1p1-krb5-config.patch 20 @@ -1 59,6 +160,7 @@21 @@ -160,6 +162,7 @@ 21 22 Requires(post): chkconfig >= 0.9, /sbin/service 22 23 Requires(pre): /usr/sbin/useradd … … 26 27 %package askpass 27 28 Summary: A passphrase dialog for OpenSSH and X 28 @@ -2 32,6 +234,8@@29 %patch6 3 -p1 -b .bannerlen30 %patch6 4 -p1 -b .compat-sessions29 @@ -229,6 +232,9 @@ 30 %patch62 -p1 -b .manpage 31 %patch65 -p1 -b .fips 31 32 32 33 +%patch1000 -p1 -b .multihomed 34 +%patch1001 -p1 -b .gssapi-env 33 35 + 34 36 autoreconf -
trunk/server/fedora/specs/php.spec.patch
r1091 r1259 1 --- php.spec.orig 2009-04- 23 11:58:08.000000000 -04002 +++ php.spec 2009-0 4-23 12:00:32.000000000 -04001 --- php.spec.orig 2009-04-15 09:24:35.000000000 -0400 2 +++ php.spec 2009-06-03 05:40:37.000000000 -0400 3 3 @@ -7,7 +7,7 @@ 4 4 Summary: PHP scripting language for creating dynamic web sites … … 10 10 Group: Development/Languages 11 11 URL: http://www.php.net/ 12 @@ -3 8,6 +38,10 @@12 @@ -39,6 +39,10 @@ 13 13 Patch60: php-5.2.7-tests-dashn.patch 14 14 Patch61: php-5.0.4-tests-wddx.patch … … 21 21 22 22 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel 23 @@ - 374,6 +378,8 @@23 @@ -404,6 +408,8 @@ 24 24 %patch60 -p1 -b .tests-dashn 25 25 %patch61 -p1 -b .tests-wddx -
trunk/server/fedora/specs/scripts-base.spec
r1236 r1259 9 9 Source: %{name}.tar.gz 10 10 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root 11 Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-p ysvn, scripts-php, php_scripts11 Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-php, php_scripts 12 12 %define debug_package %{nil} 13 13
Note: See TracChangeset
for help on using the changeset viewer.