Changeset 1615


Ignore:
Timestamp:
Sep 6, 2010, 10:47:20 PM (11 years ago)
Author:
xavid
Message:
Update spec patchs for f13.
Location:
branches/fc13-dev/server/fedora/specs
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • branches/fc13-dev/server/fedora/specs/httpd.spec.patch

    r1607 r1615  
    1 --- httpd.spec.orig     2010-08-26 21:00:40.771666965 -0400
    2 +++ httpd.spec  2010-08-26 21:01:56.601668199 -0400
     1--- httpd.spec.orig     2010-07-27 11:55:33.000000000 -0400
     2+++ httpd.spec  2010-09-06 20:45:28.000000000 -0400
    33@@ -7,7 +7,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.15
    7 -Release: 1%{?dist}.1
    8 +Release: 1%{?dist}.1.scripts.%{scriptsversion}
     6 Version: 2.2.16
     7-Release: 1%{?dist}
     8+Release: 1%{?dist}.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
     
    3333 %description devel
    3434 The httpd-devel package contains the APXS binary and other files
    35 @@ -102,6 +111,7 @@
     35@@ -103,6 +112,7 @@
    3636 Requires(post): openssl >= 0.9.7f-4, /bin/cat
    3737 Requires(pre): httpd
     
    4141 
    4242 %description -n mod_ssl
    43 @@ -129,6 +139,13 @@
     43@@ -130,6 +140,13 @@
    4444 # Patch in vendor/release string
    4545 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    5555 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    5656 if test "x${vmmn}" != "x%{mmn}"; then
    57 @@ -177,10 +194,12 @@
     57@@ -178,10 +195,12 @@
    5858         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    5959        --enable-suexec --with-suexec \
  • branches/fc13-dev/server/fedora/specs/krb5.spec.patch

    r1562 r1615  
    1 --- krb5.spec.orig      2010-05-18 14:16:44.000000000 -0400
    2 +++ krb5.spec   2010-05-20 10:20:32.000000000 -0400
    3 @@ -16,7 +16,7 @@
    4  Summary: The Kerberos network authentication system.
     1--- krb5.spec.orig      2010-05-18 14:16:09.000000000 -0400
     2+++ krb5.spec   2010-09-06 20:56:47.000000000 -0400
     3@@ -10,7 +10,7 @@
     4 Summary: The Kerberos network authentication system
    55 Name: krb5
    6  Version: 1.6.3
    7 -Release: 31%{?dist}
    8 +Release: 31%{?dist}.scripts.%{scriptsversion}
     6 Version: 1.7.1
     7-Release: 10%{?dist}
     8+Release: 10%{?dist}.scripts.%{scriptsversion}
    99 # Maybe we should explode from the now-available-to-everybody tarball instead?
    10  # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
     10 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -114,6 +114,8 @@
    13  Patch88: krb5-1.6.1-cs22427.patch
    14  Patch89: krb5-CVE-2010-1321-1.6.1.patch
     12@@ -90,6 +90,8 @@
     13 Patch101: http://web.mit.edu/kerberos/advisories/2010-004-patch.txt
     14 Patch102: krb5-CVE-2010-1321-1.7.1.patch
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
     
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 Group: System Environment/Libraries
    21 @@ -155,6 +157,7 @@
     21@@ -134,6 +136,7 @@
     22 %package libs
     23 Summary: The shared libraries used by Kerberos 5
    2224 Group: System Environment/Libraries
    23  Prereq: grep, /sbin/ldconfig, sh-utils
    24  Obsoletes: krb5-configs
    2525+Provides: scripts-krb5-libs
    2626 
    2727 %description libs
    2828 Kerberos is a network authentication system. The krb5-libs package
    29 @@ -1478,6 +1481,7 @@
    30  %patch87 -p0 -b .kpasswd_ipv6
    31  %patch88 -p0 -b .cs22427
    32  %patch89 -p1 -b .CVE-2010-1321
     29@@ -1631,6 +1634,7 @@
     30 %patch100 -p0 -b .2010-002
     31 %patch101 -p1 -b .2010-004
     32 %patch102 -p1 -b .CVE-2010-1321
    3333+%patch1000 -p1 -b .kuserok
    34  cp src/krb524/README README.krb524
    3534 gzip doc/*.ps
    3635 
     36 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
  • branches/fc13-dev/server/fedora/specs/openssh.spec.patch

    r1531 r1615  
    1 --- openssh.spec.orig   2010-03-30 02:27:53.000000000 -0400
    2 +++ openssh.spec        2010-03-30 02:30:09.000000000 -0400
    3 @@ -63,7 +63,7 @@
     1--- openssh.spec.orig   2010-05-31 06:20:02.000000000 -0400
     2+++ openssh.spec        2010-09-06 21:53:21.000000000 -0400
     3@@ -74,7 +74,7 @@
    44 Summary: An open source implementation of SSH protocol versions 1 and 2
    55 Name: openssh
    6  Version: 5.2p1
    7 -Release: 6%{?dist}%{?rescue_rel}
    8 +Release: 6%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
     6 Version: 5.4p1
     7-Release: %{openssh_rel}%{?dist}%{?rescue_rel}
     8+Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
    99 URL: http://www.openssh.com/portable.html
     10 #URL1: http://pamsshagentauth.sourceforge.net
    1011 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
    11  #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
    12 @@ -74,6 +74,8 @@
    13  Source1: openssh-nukeacss.sh
    14  Source2: sshd.pam
     12@@ -88,6 +88,8 @@
    1513 Source3: sshd.init
     14 Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2
     15 Source5: pam_ssh_agent-rmheaders
    1616+Patch1000: openssh-5.0p1-multihomed.patch
    1717+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
    18  Patch0: openssh-5.2p1-redhat.patch
    19  Patch2: openssh-5.1p1-skip-initial.patch
    20  Patch3: openssh-3.8.1p1-krb5-config.patch
    21 @@ -161,6 +163,7 @@
     18 Patch0: openssh-5.4p1-redhat.patch
     19 Patch2: openssh-5.3p1-skip-initial.patch
     20 Patch4: openssh-5.2p1-vendor.patch
     21@@ -175,6 +177,7 @@
    2222 Requires(post): chkconfig >= 0.9, /sbin/service
    2323 Requires(pre): /usr/sbin/useradd
     
    2727 %package askpass
    2828 Summary: A passphrase dialog for OpenSSH and X
    29 @@ -231,6 +234,9 @@
    30  %patch65 -p1 -b .fips
    31  %patch67 -p1 -b .selabel
     29@@ -267,6 +270,9 @@
     30 %patch75 -p1 -b .dso
     31 %patch76 -p1 -b .bz595935
    3232 
    3333+%patch1000 -p1 -b .multihomed
  • branches/fc13-dev/server/fedora/specs/shadow-utils.spec.patch

    r1507 r1615  
    1 --- shadow-utils.spec.orig      2010-03-12 00:48:00.000000000 -0500
    2 +++ shadow-utils.spec   2010-03-12 00:55:36.000000000 -0500
     1--- shadow-utils.spec.orig      2010-07-20 05:29:54.000000000 -0400
     2+++ shadow-utils.spec   2010-09-06 21:53:21.000000000 -0400
    33@@ -1,7 +1,7 @@
    44 Summary: Utilities for managing accounts and shadow password files
    55 Name: shadow-utils
    6  Version: 4.1.4.1
    7 -Release: 5%{?dist}
    8 +Release: 5.scripts.%{scriptsversion}%{?dist}
     6 Version: 4.1.4.2
     7-Release: 8%{?dist}
     8+Release: 8.scripts.%{scriptsversion}%{?dist}
    99 Epoch: 2
    1010 URL: http://pkg-shadow.alioth.debian.org/
    1111 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
    12 @@ -21,6 +21,7 @@
     12@@ -26,6 +26,7 @@
    1313 Requires: audit-libs >= 1.6.5
    1414 Requires: setup
     
    1818 %description
    1919 The shadow-utils package includes the necessary programs for
    20 @@ -60,7 +61,8 @@
    21          --with-selinux \
    22          --without-libcrack \
    23          --without-libpam \
    24 -        --disable-shared
    25 +        --disable-shared \
    26 +        --with-group-name-max-length=32
    27  make
    28  
    29  %install
    30 @@ -182,6 +184,9 @@
    31  %{_mandir}/man8/vigr.8*
    32  
    33  %changelog
    34 +* Fri Mar 12 2010 Mitchell Berger <mitchb@mit.edu> 2:4.1.4.1-5.scripts
    35 +- change max group name length back to 32
    36 +
    37  * Wed Aug 05 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.4.1-5
    38  - increase threshold for uid/gid reservations to 200 (#515667)
    39  
Note: See TracChangeset for help on using the changeset viewer.