Changeset 1259 for trunk/server/fedora/specs

Timestamp:

Jul 9, 2009, 3:48:21 PM (15 years ago)

Author:

mitchb

Message:

Reintegrate branches/fc11-dev (r1121:1258) to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• server/fedora/specs/httpd.spec.patch (modified) (4 diffs)
• server/fedora/specs/krb5.spec.patch (modified) (2 diffs)
• server/fedora/specs/nss-ldapd.spec.patch (modified) (3 diffs)
• server/fedora/specs/openafs.spec.patch (modified) (11 diffs)
• server/fedora/specs/openssh.spec.patch (modified) (2 diffs)
• server/fedora/specs/php.spec.patch (modified) (3 diffs)
• server/fedora/specs/pysvn.spec.patch (deleted)
• server/fedora/specs/scripts-base.spec (modified) (1 diff)

trunk/server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.orig     2009-03-28 13:32:47.000000000 -0400
-+++ httpd.spec  2009-03-28 14:20:15.000000000 -0400
-@@ -6,7 +6,7 @@
+--- httpd.spec.orig     2009-03-17 09:12:22.000000000 -0400
++++ httpd.spec  2009-06-03 05:05:30.000000000 -0400
+@@ -7,7 +7,7 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.2.10
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
+ Version: 2.2.11
+-Release: 8
++Release: 8.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  Source1: index.html
-@@ -54,6 +54,12 @@
+@@ -56,6 +56,12 @@
  Conflicts: pcre < 4.0
- Requires: httpd-tools = %{version}-%{release}
+ Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
  
 +Provides: scripts-httpd
@@ -23 +23 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -100,6 +106,7 @@
+@@ -102,6 +108,7 @@
  BuildRequires: openssl-devel, distcache-devel
  Requires(post): openssl >= 0.9.7f-4, /bin/cat
@@ -31 +31 @@
  
  %description -n mod_ssl
-@@ -127,6 +134,11 @@
+@@ -130,6 +137,11 @@
  # Patch in vendor/release string
  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'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -175,10 +187,12 @@
+@@ -178,10 +190,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \

trunk/server/fedora/specs/krb5.spec.patch

@@ -1 @@
---- krb5.spec.old       2009-04-08 06:26:23.000000000 -0400
-+++ krb5.spec   2009-04-08 06:29:20.000000000 -0400
+--- krb5.spec.orig      2009-04-07 15:17:07.000000000 -0400
++++ krb5.spec   2009-06-03 04:47:31.000000000 -0400
 @@ -16,7 +16,7 @@
  Summary: The Kerberos network authentication system.
  Name: krb5
  Version: 1.6.3
--Release: 16%{?dist}
-+Release: 16%{?dist}.scripts.%{scriptsversion}
+-Release: 20%{?dist}
++Release: 20%{?dist}.scripts.%{scriptsversion}
  # Maybe we should explode from the now-available-to-everybody tarball instead?
  # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
  Source0: krb5-%{version}.tar.gz
-@@ -105,6 +105,8 @@
- Patch82: krb5-CVE-2009-0846.patch
- Patch83: krb5-CVE-2009-0847.patch
+@@ -106,6 +106,8 @@
+ Patch83: krb5-CVE-2009-0846.patch
+ Patch84: krb5-CVE-2009-0847.patch
  
 +Patch1000: krb5-kuserok-scripts.patch
 +
- License: MIT, freely distributable.
+ License: MIT
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -146,6 +148,7 @@
+@@ -147,6 +149,7 @@
  Group: System Environment/Libraries
  Prereq: grep, /sbin/ldconfig, sh-utils
@@ -27 +27 @@
  %description libs
  Kerberos is a network authentication system. The krb5-libs package
-@@ -1389,6 +1392,7 @@
- %patch81 -p1 -b .CVE-2009-0844-0845-2
- %patch82 -p1 -b .CVE-2009-0846
- %patch83 -p1 -b .CVE-2009-0847
+@@ -1413,6 +1416,7 @@
+ %patch82 -p1 -b .CVE-2009-0844-0845-2
+ %patch83 -p1 -b .CVE-2009-0846
+ %patch84 -p1 -b .CVE-2009-0847
 +%patch1000 -p1 -b .kuserok
  cp src/krb524/README README.krb524

trunk/server/fedora/specs/nss-ldapd.spec.patch

@@ -1 +1 @@
 --- nss-ldapd.spec.orig 2009-03-30 04:33:50.000000000 -0400
-+++ nss-ldapd.spec      2009-05-24 18:39:15.000000000 -0400
++++ nss-ldapd.spec      2009-06-03 03:18:49.000000000 -0400
 @@ -19,18 +19,19 @@
  
@@ -55 +55 @@
  %files
  %defattr(-,root,root)
-@@ -104,11 +99,12 @@
+@@ -104,7 +99,6 @@
  %doc %{_mandir}/man8/*
  %config(noreplace) %attr(640,root,root) /etc/nss-ldapd.conf
@@ -63 +63 @@
  /usr/sbin/nslcd
  
- %changelog
-+* Sun May 24 2009 Anders Kaseorg <andersk@mit.edu> - 0.6.8-2.1
-+- Update for Fedora again.
- * Wed Mar 25 2009 rhafer@suse.de
- - Updated to 0.6.8:
-   * the nss-ldapd.conf was created world-readable which could cause
-@@ -129,6 +125,10 @@
+@@ -129,6 +123,10 @@
  - Adjust config file permissions upon update, to fix world-readable
    /etc/nss-ldapd.conf as created by older versions

trunk/server/fedora/specs/openafs.spec.patch

@@ -1 @@
---- openafs.spec.orig   2009-04-08 08:17:00.000000000 -0400
-+++ openafs.spec        2009-04-14 04:32:44.000000000 -0400
+--- openafs.spec.orig   2009-06-03 04:16:03.000000000 -0400
++++ openafs.spec        2009-06-12 02:05:57.000000000 -0400
 @@ -8,7 +8,7 @@
  # for beta/rc releases make pkgrel 0.X.<tag>
@@ -10 +10 @@
  %if %{?osvers:0}%{!?osvers:1}
  %define osvers 1
-@@ -261,6 +261,11 @@
+@@ -261,6 +261,14 @@
  %endif
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
@@ -18 +18 @@
 +Patch1002: openafs-pts-encrypt.patch
 +Patch1003: openafs-localcsdb.patch
++Patch1004: openafs-delta-dprintf-rename-20090427.patch
++Patch1005: openafs-numsysnames.patch
++Patch1006: openafs-delta-linux26-defer-cred-changing-20090511.patch
 +
  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
-@@ -343,6 +348,7 @@
+@@ -343,6 +351,7 @@
  %if %{build_userspace}
  
@@ -30 +33 @@
  
  %if %{fedorakmod}
-@@ -403,6 +409,7 @@
+@@ -403,6 +412,7 @@
  
  %if %{build_authlibs}
@@ -38 +41 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +426,7 @@
+@@ -419,6 +429,7 @@
  %endif
  
@@ -46 +49 @@
  Requires: openafs-authlibs = %{PACKAGE_VERSION}
  %endif
-@@ -437,6 +445,7 @@
+@@ -437,6 +448,7 @@
  libraries.
  
@@ -54 +57 @@
  Group: Development/Filesystems
  
-@@ -465,6 +474,7 @@
+@@ -465,6 +477,7 @@
  administrators.
  
@@ -62 +65 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{PACKAGE_VERSION}
-@@ -514,6 +524,7 @@
+@@ -514,6 +527,7 @@
  
  %if %{krb5support}
@@ -70 +73 @@
  Requires: openafs = %{PACKAGE_VERSION}
  Group: Networking/Filesystems
-@@ -540,7 +551,7 @@
+@@ -540,7 +554,7 @@
  %if %{build_modules}
  
@@ -79 +82 @@
  %else
  
-@@ -699,6 +710,10 @@
+@@ -699,6 +713,13 @@
  
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
@@ -87 +90 @@
 +%patch1002 -p1 -b .pts-encrypt
 +%patch1003 -p1 -b .localcsdb
++%patch1004 -p1 -b .dprintf
++%patch1005 -p1 -b .numsysnames
++%patch1006 -p1 -b .defercredchanging
  
  ##############################################################################

trunk/server/fedora/specs/openssh.spec.patch

@@ -1 @@
---- openssh.spec.orig   2009-01-01 21:06:01.000000000 -0500
-+++ openssh.spec        2009-01-01 22:52:02.000000000 -0500
+--- openssh.spec-pristine       2009-07-01 18:55:04.579034598 -0400
++++ openssh.spec        2009-07-01 18:49:33.068037580 -0400
 @@ -63,7 +63,7 @@
- Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
+ Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
- Version: 5.1p1
--Release: 3%{?dist}%{?rescue_rel}
-+Release: 3%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
+ Version: 5.2p1
+-Release: 2%{?dist}%{?rescue_rel}
++Release: 2%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
  URL: http://www.openssh.com/portable.html
  #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
  #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
-@@ -74,6 +74,7 @@
+@@ -74,6 +74,8 @@
  Source1: openssh-nukeacss.sh
  Source2: sshd.pam
  Source3: sshd.init
 +Patch1000: openssh-5.0p1-multihomed.patch
- Patch0: openssh-5.1p1-redhat.patch
++Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
+ Patch0: openssh-5.2p1-redhat.patch
  Patch2: openssh-5.1p1-skip-initial.patch
  Patch3: openssh-3.8.1p1-krb5-config.patch
-@@ -159,6 +160,7 @@
+@@ -160,6 +162,7 @@
  Requires(post): chkconfig >= 0.9, /sbin/service
  Requires(pre): /usr/sbin/useradd
@@ -26 +27 @@
  %package askpass
  Summary: A passphrase dialog for OpenSSH and X
-@@ -232,6 +234,8 @@
- %patch63 -p1 -b .bannerlen
- %patch64 -p1 -b .compat-sessions
+@@ -229,6 +232,9 @@
+ %patch62 -p1 -b .manpage
+ %patch65 -p1 -b .fips
  
 +%patch1000 -p1 -b .multihomed
++%patch1001 -p1 -b .gssapi-env
 +
  autoreconf

trunk/server/fedora/specs/php.spec.patch

@@ -1 @@
---- php.spec.orig       2009-04-23 11:58:08.000000000 -0400
-+++ php.spec    2009-04-23 12:00:32.000000000 -0400
+--- php.spec.orig       2009-04-15 09:24:35.000000000 -0400
++++ php.spec    2009-06-03 05:40:37.000000000 -0400
 @@ -7,7 +7,7 @@
  Summary: PHP scripting language for creating dynamic web sites
@@ -10 +10 @@
  Group: Development/Languages
  URL: http://www.php.net/
-@@ -38,6 +38,10 @@
+@@ -39,6 +39,10 @@
  Patch60: php-5.2.7-tests-dashn.patch
  Patch61: php-5.0.4-tests-wddx.patch
@@ -21 +21 @@
  
  BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
-@@ -374,6 +378,8 @@
+@@ -404,6 +408,8 @@
  %patch60 -p1 -b .tests-dashn
  %patch61 -p1 -b .tests-wddx

trunk/server/fedora/specs/scripts-base.spec

@@ -9 +9 @@
 Source: %{name}.tar.gz 
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
-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-pysvn, scripts-php, php_scripts
+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
 %define debug_package %{nil}