Changeset 925

Timestamp:

Jan 1, 2009, 9:12:56 PM (15 years ago)

Author:

quentin

Message:

Update specfile patches to provide scripts-specific virtual packages that we can depend on

Location:

server/fedora/specs

Files:

• httpd.spec.patch (modified) (3 diffs)
• krb5.spec.patch (modified) (2 diffs)
• openafs.spec.patch (modified) (2 diffs)
• openssh.spec.patch (modified) (2 diffs)

server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.orig     2008-02-19 02:05:36.000000000 -0500
-+++ httpd.spec  2008-05-20 19:39:59.000000000 -0400
-@@ -54,6 +54,10 @@
+--- httpd.spec.orig     2009-01-01 21:06:31.000000000 -0500
++++ httpd.spec  2009-01-01 21:08:14.000000000 -0500
+@@ -54,6 +54,11 @@
  Conflicts: pcre < 4.0
  Requires: httpd-tools = %{version}-%{release}
  
++Provides: scripts-httpd
 +Patch1000: httpd-suexec-scripts.patch
 +Patch1001: httpd-2.2.x-sni.patch
@@ -12 +13 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -127,6 +131,10 @@
+@@ -100,6 +105,7 @@
+ BuildRequires: openssl-devel, distcache-devel
+ Requires(post): openssl >= 0.9.7f-4, /bin/cat
+ Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
++Provides: scripts-mod_ssl
+ Obsoletes: stronghold-mod_ssl
+ 
+ %description -n mod_ssl
+@@ -127,6 +133,10 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -23 +32 @@
  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 +183,12 @@
+@@ -175,10 +185,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \

server/fedora/specs/krb5.spec.patch

@@ -1 @@
---- krb5.spec.orig      2008-03-18 14:13:22.000000000 -0400
-+++ krb5.spec   2008-05-20 23:53:40.000000000 -0400
+--- krb5.spec.orig      2009-01-01 21:06:35.000000000 -0500
++++ krb5.spec   2009-01-01 21:10:27.000000000 -0500
+@@ -16,7 +16,7 @@
+ Summary: The Kerberos network authentication system.
+ Name: krb5
+ Version: 1.6.3
+-Release: 10%{?dist}
++Release: 10.scripts%{?dist}
+ # 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
 @@ -101,6 +101,8 @@
  Patch76: krb5-CVE-2007-5901.patch
@@ -10 +19 @@
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -1349,6 +1351,7 @@
+@@ -142,6 +144,7 @@
+ Group: System Environment/Libraries
+ Prereq: grep, /sbin/ldconfig, sh-utils
+ Obsoletes: krb5-configs
++Provides: scripts-krb5-libs
+ 
+ %description libs
+ Kerberos is a network authentication system. The krb5-libs package
+@@ -1349,6 +1352,7 @@
  %patch75 -p0 -b .2008-0947
  %patch76 -p0 -b .2007-5901

server/fedora/specs/openafs.spec.patch

@@ -1 @@
---- openafs.spec.orig   2008-04-28 18:13:44.000000000 -0400
-+++ openafs.spec        2008-06-03 12:36:29.000000000 -0400
-@@ -240,6 +240,10 @@
+--- openafs.spec.orig   2009-01-01 13:46:41.000000000 -0500
++++ openafs.spec        2009-01-01 13:58:29.000000000 -0500
+@@ -8,7 +8,7 @@
+ # for beta/rc releases make pkgrel 0.X.<tag>
+ # for real releases make pkgrel 1 (or more for extra releases)
+ #%define pkgrel 0.1.rc1
+-%define pkgrel 1.1
++%define pkgrel 1.1.scripts
+ 
+ %if %{?osvers:0}%{!?osvers:1}
+ %define osvers 1
+@@ -261,6 +261,10 @@
  %endif
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
@@ -12 +21 @@
  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
-@@ -678,6 +681,9 @@
+@@ -343,6 +347,7 @@
+ %if %{build_userspace}
+ 
+ %package client
++Provides: scripts-openafs-client
+ Requires: binutils, openafs = %{PACKAGE_VERSION}
+ 
+ %if %{fedorakmod}
+@@ -403,6 +408,7 @@
+ 
+ %if %{build_authlibs}
+ %package authlibs
++Provides: scripts-openafs-authlibs
+ Summary: OpenAFS authentication shared libraries
+ Group: Networking/Filesystems
+ 
+@@ -419,6 +425,7 @@
+ %endif
+ 
+ %package authlibs-devel
++Provides: scripts-openafs-authlibs-devel
+ %if %{build_authlibs}
+ Requires: openafs-authlibs = %{PACKAGE_VERSION}
+ %endif
+@@ -437,6 +444,7 @@
+ libraries.
+ 
+ %package devel
++Provides: scripts-openafs-devel
+ Summary: OpenAFS Development Libraries and Headers
+ Group: Development/Filesystems
+ 
+@@ -465,6 +473,7 @@
+ administrators.
+ 
+ %package kernel-source
++Provides: scripts-openafs-kernel-source
+ Summary: OpenAFS Kernel Module source tree
+ Group: Networking/Filesystems
+ Provides: openafs-kernel = %{PACKAGE_VERSION}
+@@ -514,6 +523,7 @@
+ 
+ %if %{krb5support}
+ %package krb5
++Provides: scripts-openafs-krb5
+ Summary: OpenAFS programs to use with krb5
+ Requires: openafs = %{PACKAGE_VERSION}
+ Group: Networking/Filesystems
+@@ -699,6 +709,9 @@
  
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"

server/fedora/specs/openssh.spec.patch

@@ -1 @@
---- openssh.spec.orig   2008-04-07 16:14:31.000000000 -0400
-+++ openssh.spec        2008-05-20 23:14:52.000000000 -0400
+--- openssh.spec.orig   2009-01-01 21:06:01.000000000 -0500
++++ openssh.spec        2009-01-01 21:11:41.000000000 -0500
 @@ -74,6 +74,7 @@
  Source1: openssh-nukeacss.sh
@@ -9 +9 @@
  Patch2: openssh-5.1p1-skip-initial.patch
  Patch3: openssh-3.8.1p1-krb5-config.patch
-@@ -229,6 +230,8 @@
- %patch58 -p1 -b .controlcleanup
- %patch59 -p1 -b .master-race
+@@ -159,6 +160,7 @@
+ Requires(post): chkconfig >= 0.9, /sbin/service
+ Requires(pre): /usr/sbin/useradd
+ Requires: pam >= 1.0.1-3
++Provides: scripts-openssh-server
+ 
+ %package askpass
+ Summary: A passphrase dialog for OpenSSH and X
+@@ -232,6 +234,8 @@
+ %patch63 -p1 -b .bannerlen
+ %patch64 -p1 -b .compat-sessions
  
 +%patch1000 -p1 -b .multihomed