Ignore:
Timestamp:
Jul 9, 2009, 3:48:21 PM (13 years ago)
Author:
mitchb
Message:
Reintegrate branches/fc11-dev (r1121:1258) to trunk
Location:
trunk
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

    r1035 r1259  
    1 --- httpd.spec.orig     2009-03-28 13:32:47.000000000 -0400
    2 +++ httpd.spec  2009-03-28 14:20:15.000000000 -0400
    3 @@ -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 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.10
    7 -Release: 1%{?dist}
    8 +Release: 1%{?dist}.scripts.%{scriptsversion}
     6 Version: 2.2.11
     7-Release: 8
     8+Release: 8.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1111 Source1: index.html
    12 @@ -54,6 +54,12 @@
     12@@ -56,6 +56,12 @@
    1313 Conflicts: pcre < 4.0
    14  Requires: httpd-tools = %{version}-%{release}
     14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
    1515 
    1616+Provides: scripts-httpd
     
    2323 The Apache HTTP Server is a powerful, efficient, and extensible
    2424 web server.
    25 @@ -100,6 +106,7 @@
     25@@ -102,6 +108,7 @@
    2626 BuildRequires: openssl-devel, distcache-devel
    2727 Requires(post): openssl >= 0.9.7f-4, /bin/cat
     
    3131 
    3232 %description -n mod_ssl
    33 @@ -127,6 +134,11 @@
     33@@ -130,6 +137,11 @@
    3434 # Patch in vendor/release string
    3535 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    4343 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    4444 if test "x${vmmn}" != "x%{mmn}"; then
    45 @@ -175,10 +187,12 @@
     45@@ -178,10 +190,12 @@
    4646         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    4747        --enable-suexec --with-suexec \
  • trunk/server/fedora/specs/krb5.spec.patch

    r1069 r1259  
    1 --- krb5.spec.old       2009-04-08 06:26:23.000000000 -0400
    2 +++ krb5.spec   2009-04-08 06:29:20.000000000 -0400
     1--- krb5.spec.orig      2009-04-07 15:17:07.000000000 -0400
     2+++ krb5.spec   2009-06-03 04:47:31.000000000 -0400
    33@@ -16,7 +16,7 @@
    44 Summary: The Kerberos network authentication system.
    55 Name: krb5
    66 Version: 1.6.3
    7 -Release: 16%{?dist}
    8 +Release: 16%{?dist}.scripts.%{scriptsversion}
     7-Release: 20%{?dist}
     8+Release: 20%{?dist}.scripts.%{scriptsversion}
    99 # Maybe we should explode from the now-available-to-everybody tarball instead?
    1010 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -105,6 +105,8 @@
    13  Patch82: krb5-CVE-2009-0846.patch
    14  Patch83: krb5-CVE-2009-0847.patch
     12@@ -106,6 +106,8 @@
     13 Patch83: krb5-CVE-2009-0846.patch
     14 Patch84: krb5-CVE-2009-0847.patch
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
    1717+
    18  License: MIT, freely distributable.
     18 License: MIT
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 Group: System Environment/Libraries
    21 @@ -146,6 +148,7 @@
     21@@ -147,6 +149,7 @@
    2222 Group: System Environment/Libraries
    2323 Prereq: grep, /sbin/ldconfig, sh-utils
     
    2727 %description libs
    2828 Kerberos is a network authentication system. The krb5-libs package
    29 @@ -1389,6 +1392,7 @@
    30  %patch81 -p1 -b .CVE-2009-0844-0845-2
    31  %patch82 -p1 -b .CVE-2009-0846
    32  %patch83 -p1 -b .CVE-2009-0847
     29@@ -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
    3333+%patch1000 -p1 -b .kuserok
    3434 cp src/krb524/README README.krb524
  • trunk/server/fedora/specs/nss-ldapd.spec.patch

    r1132 r1259  
    11--- nss-ldapd.spec.orig 2009-03-30 04:33:50.000000000 -0400
    2 +++ nss-ldapd.spec      2009-05-24 18:39:15.000000000 -0400
     2+++ nss-ldapd.spec      2009-06-03 03:18:49.000000000 -0400
    33@@ -19,18 +19,19 @@
    44 
     
    5555 %files
    5656 %defattr(-,root,root)
    57 @@ -104,11 +99,12 @@
     57@@ -104,7 +99,6 @@
    5858 %doc %{_mandir}/man8/*
    5959 %config(noreplace) %attr(640,root,root) /etc/nss-ldapd.conf
     
    6363 /usr/sbin/nslcd
    6464 
    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 @@
    7266 - Adjust config file permissions upon update, to fix world-readable
    7367   /etc/nss-ldapd.conf as created by older versions
  • trunk/server/fedora/specs/openafs.spec.patch

    r1079 r1259  
    1 --- openafs.spec.orig   2009-04-08 08:17:00.000000000 -0400
    2 +++ openafs.spec        2009-04-14 04:32:44.000000000 -0400
     1--- openafs.spec.orig   2009-06-03 04:16:03.000000000 -0400
     2+++ openafs.spec        2009-06-12 02:05:57.000000000 -0400
    33@@ -8,7 +8,7 @@
    44 # for beta/rc releases make pkgrel 0.X.<tag>
     
    1010 %if %{?osvers:0}%{!?osvers:1}
    1111 %define osvers 1
    12 @@ -261,6 +261,11 @@
     12@@ -261,6 +261,14 @@
    1313 %endif
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
     
    1818+Patch1002: openafs-pts-encrypt.patch
    1919+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
    2023+
    2124 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    2225 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2326 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    24 @@ -343,6 +348,7 @@
     27@@ -343,6 +351,7 @@
    2528 %if %{build_userspace}
    2629 
     
    3033 
    3134 %if %{fedorakmod}
    32 @@ -403,6 +409,7 @@
     35@@ -403,6 +412,7 @@
    3336 
    3437 %if %{build_authlibs}
     
    3841 Group: Networking/Filesystems
    3942 
    40 @@ -419,6 +426,7 @@
     43@@ -419,6 +429,7 @@
    4144 %endif
    4245 
     
    4649 Requires: openafs-authlibs = %{PACKAGE_VERSION}
    4750 %endif
    48 @@ -437,6 +445,7 @@
     51@@ -437,6 +448,7 @@
    4952 libraries.
    5053 
     
    5457 Group: Development/Filesystems
    5558 
    56 @@ -465,6 +474,7 @@
     59@@ -465,6 +477,7 @@
    5760 administrators.
    5861 
     
    6265 Group: Networking/Filesystems
    6366 Provides: openafs-kernel = %{PACKAGE_VERSION}
    64 @@ -514,6 +524,7 @@
     67@@ -514,6 +527,7 @@
    6568 
    6669 %if %{krb5support}
     
    7073 Requires: openafs = %{PACKAGE_VERSION}
    7174 Group: Networking/Filesystems
    72 @@ -540,7 +551,7 @@
     75@@ -540,7 +554,7 @@
    7376 %if %{build_modules}
    7477 
     
    7982 %else
    8083 
    81 @@ -699,6 +710,10 @@
     84@@ -699,6 +713,13 @@
    8285 
    8386 # Patch openafs to build a kernel module named "openafs" instead of "libafs"
     
    8790+%patch1002 -p1 -b .pts-encrypt
    8891+%patch1003 -p1 -b .localcsdb
     92+%patch1004 -p1 -b .dprintf
     93+%patch1005 -p1 -b .numsysnames
     94+%patch1006 -p1 -b .defercredchanging
    8995 
    9096 ##############################################################################
  • trunk/server/fedora/specs/openssh.spec.patch

    r926 r1259  
    1 --- openssh.spec.orig   2009-01-01 21:06:01.000000000 -0500
    2 +++ openssh.spec        2009-01-01 22:52:02.000000000 -0500
     1--- openssh.spec-pristine       2009-07-01 18:55:04.579034598 -0400
     2+++ openssh.spec        2009-07-01 18:49:33.068037580 -0400
    33@@ -63,7 +63,7 @@
    4  Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
     4 Summary: An open source implementation of SSH protocol versions 1 and 2
    55 Name: openssh
    6  Version: 5.1p1
    7 -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}
    99 URL: http://www.openssh.com/portable.html
    1010 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
    1111 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
    12 @@ -74,6 +74,7 @@
     12@@ -74,6 +74,8 @@
    1313 Source1: openssh-nukeacss.sh
    1414 Source2: sshd.pam
    1515 Source3: sshd.init
    1616+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
    1819 Patch2: openssh-5.1p1-skip-initial.patch
    1920 Patch3: openssh-3.8.1p1-krb5-config.patch
    20 @@ -159,6 +160,7 @@
     21@@ -160,6 +162,7 @@
    2122 Requires(post): chkconfig >= 0.9, /sbin/service
    2223 Requires(pre): /usr/sbin/useradd
     
    2627 %package askpass
    2728 Summary: A passphrase dialog for OpenSSH and X
    28 @@ -232,6 +234,8 @@
    29  %patch63 -p1 -b .bannerlen
    30  %patch64 -p1 -b .compat-sessions
     29@@ -229,6 +232,9 @@
     30 %patch62 -p1 -b .manpage
     31 %patch65 -p1 -b .fips
    3132 
    3233+%patch1000 -p1 -b .multihomed
     34+%patch1001 -p1 -b .gssapi-env
    3335+
    3436 autoreconf
  • trunk/server/fedora/specs/php.spec.patch

    r1091 r1259  
    1 --- php.spec.orig       2009-04-23 11:58:08.000000000 -0400
    2 +++ php.spec    2009-04-23 12:00:32.000000000 -0400
     1--- php.spec.orig       2009-04-15 09:24:35.000000000 -0400
     2+++ php.spec    2009-06-03 05:40:37.000000000 -0400
    33@@ -7,7 +7,7 @@
    44 Summary: PHP scripting language for creating dynamic web sites
     
    1010 Group: Development/Languages
    1111 URL: http://www.php.net/
    12 @@ -38,6 +38,10 @@
     12@@ -39,6 +39,10 @@
    1313 Patch60: php-5.2.7-tests-dashn.patch
    1414 Patch61: php-5.0.4-tests-wddx.patch
     
    2121 
    2222 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
    23 @@ -374,6 +378,8 @@
     23@@ -404,6 +408,8 @@
    2424 %patch60 -p1 -b .tests-dashn
    2525 %patch61 -p1 -b .tests-wddx
  • trunk/server/fedora/specs/scripts-base.spec

    r1236 r1259  
    99Source: %{name}.tar.gz
    1010BuildRoot: %{_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-pysvn, scripts-php, php_scripts
     11Requires: 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
    1212%define debug_package %{nil}
    1313
Note: See TracChangeset for help on using the changeset viewer.