Changeset 2429 for branches/fc19-dev/server/fedora/specs

Timestamp:

Jun 12, 2013, 10:58:31 PM (11 years ago)

Author:

tboning

Message:

Built a bunch of packages, krb5 still has issues.

Location:

branches/fc19-dev/server/fedora/specs

Files:

• httpd.spec.patch (modified) (1 diff)
• krb5.spec.patch (modified) (2 diffs)
• openafs.spec.patch (modified) (4 diffs)
• openssh.spec.patch (modified) (4 diffs)

branches/fc19-dev/server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.orig     2013-05-29 00:46:07.522169507 -0400
-+++ httpd.spec  2013-05-29 00:46:37.905169507 -0400
+--- httpd.spec.orig     2013-06-09 23:29:34.233169507 -0400
++++ httpd.spec  2013-06-09 23:28:41.956169507 -0400
 @@ -14,7 +14,7 @@
  Summary: Apache HTTP Server
  Name: httpd
  Version: 2.4.4
--Release: 4%{?dist}
-+Release: 4%{?dist}.scripts.%{scriptsversion}
+-Release: 6%{?dist}
++Release: 6%{?dist}.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -79,6 +79,12 @@
- Requires(postun): systemd-units
- Requires(post): systemd-units
- 
-+Provides: scripts-httpd = %{version}-%{release}
-+Patch1001: httpd-suexec-scripts.patch
-+Patch1002: httpd-mod_status-security.patch
-+Patch1003: httpd-304s.patch
-+Patch1004: httpd-fixup-vhost.patch
-+
- %description
- The Apache HTTP Server is a powerful, efficient, and extensible
- web server.
-@@ -89,6 +95,7 @@
- Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
- Requires: apr-devel, apr-util-devel, pkgconfig
- Requires: httpd = %{version}-%{release}
-+Provides: scripts-httpd-devel = %{version}-%{release}
- 
- %description devel
- The httpd-devel package contains the APXS binary and other files
-@@ -127,6 +134,7 @@
- Requires(post): openssl, /bin/cat
- Requires(pre): httpd
- Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
-+Provides: scripts-mod_ssl
- Obsoletes: stronghold-mod_ssl
- 
- %description -n mod_ssl
-@@ -189,6 +197,11 @@
- # Prevent use of setcap in "install-suexec-caps" target.
- sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
- 
-+%patch1001 -p1 -b .suexec-scripts
-+%patch1002 -p1 -b .mod_status-security
-+%patch1003 -p1 -b .scripts-304s
-+%patch1004 -p1 -b .fixup-vhost
-+
- # Safety check: prevent build if defined MMN does not equal upstream MMN.
- vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
- if test "x${vmmn}" != "x%{mmn}"; then
-@@ -235,11 +248,13 @@
-        --enable-suexec --with-suexec \
-         --enable-suexec-capabilities \
-        --with-suexec-caller=%{suexec_caller} \
--       --with-suexec-docroot=%{docroot} \
--       --without-suexec-logfile \
--        --with-suexec-syslog \
-+       --with-suexec-docroot=/ \
-+       --with-suexec-userdir=web_scripts \
-+       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
-+       --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
-+        --without-suexec-syslog \
-        --with-suexec-bin=%{_sbindir}/suexec \
--       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
-+       --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
-         --enable-pie \
-         --with-pcre \
-         --enable-mods-shared=all \

branches/fc19-dev/server/fedora/specs/krb5.spec.patch

@@ -1 @@
---- krb5.spec.orig      2013-04-26 20:11:39.831850109 -0400
-+++ krb5.spec   2013-04-26 20:12:32.475790490 -0400
-@@ -20,7 +20,7 @@
+--- krb5.spec.orig      2013-06-09 23:11:12.810169507 -0400
++++ krb5.spec   2013-06-09 23:16:13.634169507 -0400
+@@ -30,7 +30,7 @@
  Summary: The Kerberos network authentication system
  Name: krb5
- Version: 1.10.2
--Release: 11%{?dist}
-+Release: 11%{?dist}.scripts.%{scriptsversion}
+ Version: 1.11.3
+-Release: 1%{?dist}
++Release: 1%{?dist}.scripts.%{scriptsversion} 
  # Maybe we should explode from the now-available-to-everybody tarball instead?
- # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.2-signed.tar
+ # http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.3-signed.tar
  Source0: krb5-%{version}.tar.gz
-@@ -76,6 +76,8 @@
- Patch112: krb5-1.10-CVE-2013-1416.patch
- Patch113: krb5-fast-msg_type.patch
+@@ -89,6 +89,8 @@
+ Patch201: krb5-1.11.2-keycheck.patch
+ Patch202: krb5-1.11.2-otp.patch
  
 +Patch1000: krb5-kuserok-scripts.patch
@@ -19 +19 @@
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -133,6 +135,7 @@
+@@ -175,6 +177,7 @@
  %package libs
  Summary: The shared libraries used by Kerberos 5
  Group: System Environment/Libraries
 +Provides: scripts-krb5-libs, scripts-krb5-libs%{?_isa}
+ %if 0%{?rhel} == 6
+ # Some of the older libsmbclient builds here incorrectly called
+ # krb5_locate_kdc(), which was mistakenly exported in 1.9.
+@@ -313,6 +316,7 @@
  
- %description libs
- Kerberos is a network authentication system. The krb5-libs package
-@@ -259,6 +262,7 @@
- %patch111 -p1 -b .pkinit-agility
- %patch112 -p1 -b .CVE-2013-1416
- %patch113 -p1 -b .fast-msg_type
-+%patch1000 -p1 -b .kuserok
- rm src/lib/krb5/krb/deltat.c
+ %patch201 -p1 -b .keycheck
+ %patch202 -p1 -b .otp
++%patch1000 -p1 -b .kuserok  
  
- gzip doc/*.ps
+ # Take the execute bit off of documentation.
+ chmod -x doc/krb5-protocol/*.txt

branches/fc19-dev/server/fedora/specs/openafs.spec.patch

@@ -1 @@
---- openafs.spec.orig   2012-11-10 05:22:28.754019405 -0500
-+++ openafs.spec        2012-11-10 12:45:48.679334955 -0500
+--- openafs.spec.orig   2013-06-12 22:45:03.694169507 -0400
++++ openafs.spec        2013-06-12 22:46:25.703169507 -0400
 @@ -4,7 +4,7 @@
- %define pkgvers 1.6.2
+ %define pkgvers 1.6.3
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
--%define pkgrel 1
-+%define pkgrel 1.99.scripts.%{scriptsversion}
+-%define pkgrel 0.pre3
++%define pkgrel 0.pre3.99.scripts.%{scriptsversion}
  
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,16 @@
+@@ -249,9 +249,15 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -21 +21 @@
 +Patch1002: openafs-systemd-crond.patch
 +Patch1003: openafs-systemd-csdb.patch
-+Patch1004: openafs-linux-3.8-enablement.patch
 +%define _default_patch_fuzz 2
 +
@@ -92 +91 @@
  %else
  
-@@ -698,6 +711,12 @@
+@@ -698,6 +711,11 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -100 +99 @@
 +%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
-+%patch1004 -p1 -b .3.8-enablement
 +
  ##############################################################################

branches/fc19-dev/server/fedora/specs/openssh.spec.patch

@@ -1 @@
---- openssh.spec.orig   2012-06-18 18:16:43.764813595 -0400
-+++ openssh.spec        2012-06-18 18:24:40.478720527 -0400
+--- openssh.spec.orig   2013-05-01 19:02:52.961058569 -0400
++++ openssh.spec        2013-05-01 19:15:58.952058569 -0400
 @@ -74,7 +74,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
@@ -9 +9 @@
  URL: http://www.openssh.com/portable.html
  #URL1: http://pamsshagentauth.sourceforge.net
- #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-@@ -221,6 +221,7 @@
- #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
- # sctp
- #https://bugzilla.mindrot.org/show_bug.cgi?id=1873 => https://bugzilla.redhat.com/show_bug.cgi?id=668993
+ Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
+@@ -187,6 +187,7 @@
+ # add latest config.{sub,guess} to support aarch64 (#926284)
+ Patch907: openssh-6.2p1-aarch64.patch
+ 
 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
  
  License: BSD
  Group: Applications/Internet
-@@ -271,6 +272,7 @@
+@@ -238,6 +239,7 @@
  Group: Applications/Internet
  Requires: openssh = %{version}-%{release}
@@ -26 +26 @@
  %package server
  Summary: An open source SSH server daemon
-@@ -458,10 +460,12 @@
- %patch714 -p0 -b .null-xcrypt
+@@ -407,10 +409,12 @@
+ %patch713 -p1 -b .ctr-cavs
  
  %patch800 -p1 -b .gsskex
@@ -36 +36 @@
  %patch900 -p1 -b .canohost
 -%patch901 -p1 -b .kuserok
-+# Remove the kuserok patch as it won't apply without patch800
++# Remove the kuserok patch as it won't apply without patch800  
 +# %patch901 -p1 -b .kuserok
- %patch902 -p1 -b .man-moduli
- %patch903 -p1 -b .ipqos
- 
-@@ -469,6 +473,8 @@
+ %patch905 -p1 -b .modpipe-cflags
+ %patch906 -p1 -b .identityfile
+ %patch907 -p1 -b .aarch64
+@@ -419,6 +423,8 @@
  # Nothing here yet
  %endif