Ignore:
Timestamp:
Jun 12, 2013, 10:58:31 PM (9 years ago)
Author:
tboning
Message:
Built a bunch of packages, krb5 still has issues.
Location:
branches/fc19-dev/server/fedora/specs
Files:
4 edited

Legend:

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

    r2422 r2429  
    1 --- httpd.spec.orig     2013-05-29 00:46:07.522169507 -0400
    2 +++ httpd.spec  2013-05-29 00:46:37.905169507 -0400
     1--- httpd.spec.orig     2013-06-09 23:29:34.233169507 -0400
     2+++ httpd.spec  2013-06-09 23:28:41.956169507 -0400
    33@@ -14,7 +14,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    66 Version: 2.4.4
    7 -Release: 4%{?dist}
    8 +Release: 4%{?dist}.scripts.%{scriptsversion}
     7-Release: 6%{?dist}
     8+Release: 6%{?dist}.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -79,6 +79,12 @@
    13  Requires(postun): systemd-units
    14  Requires(post): systemd-units
    15  
    16 +Provides: scripts-httpd = %{version}-%{release}
    17 +Patch1001: httpd-suexec-scripts.patch
    18 +Patch1002: httpd-mod_status-security.patch
    19 +Patch1003: httpd-304s.patch
    20 +Patch1004: httpd-fixup-vhost.patch
    21 +
    22  %description
    23  The Apache HTTP Server is a powerful, efficient, and extensible
    24  web server.
    25 @@ -89,6 +95,7 @@
    26  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    27  Requires: apr-devel, apr-util-devel, pkgconfig
    28  Requires: httpd = %{version}-%{release}
    29 +Provides: scripts-httpd-devel = %{version}-%{release}
    30  
    31  %description devel
    32  The httpd-devel package contains the APXS binary and other files
    33 @@ -127,6 +134,7 @@
    34  Requires(post): openssl, /bin/cat
    35  Requires(pre): httpd
    36  Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
    37 +Provides: scripts-mod_ssl
    38  Obsoletes: stronghold-mod_ssl
    39  
    40  %description -n mod_ssl
    41 @@ -189,6 +197,11 @@
    42  # Prevent use of setcap in "install-suexec-caps" target.
    43  sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
    44  
    45 +%patch1001 -p1 -b .suexec-scripts
    46 +%patch1002 -p1 -b .mod_status-security
    47 +%patch1003 -p1 -b .scripts-304s
    48 +%patch1004 -p1 -b .fixup-vhost
    49 +
    50  # Safety check: prevent build if defined MMN does not equal upstream MMN.
    51  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    52  if test "x${vmmn}" != "x%{mmn}"; then
    53 @@ -235,11 +248,13 @@
    54         --enable-suexec --with-suexec \
    55          --enable-suexec-capabilities \
    56         --with-suexec-caller=%{suexec_caller} \
    57 -       --with-suexec-docroot=%{docroot} \
    58 -       --without-suexec-logfile \
    59 -        --with-suexec-syslog \
    60 +       --with-suexec-docroot=/ \
    61 +       --with-suexec-userdir=web_scripts \
    62 +       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    63 +       --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    64 +        --without-suexec-syslog \
    65         --with-suexec-bin=%{_sbindir}/suexec \
    66 -       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
    67 +       --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    68          --enable-pie \
    69          --with-pcre \
    70          --enable-mods-shared=all \
  • branches/fc19-dev/server/fedora/specs/krb5.spec.patch

    r2398 r2429  
    1 --- krb5.spec.orig      2013-04-26 20:11:39.831850109 -0400
    2 +++ krb5.spec   2013-04-26 20:12:32.475790490 -0400
    3 @@ -20,7 +20,7 @@
     1--- krb5.spec.orig      2013-06-09 23:11:12.810169507 -0400
     2+++ krb5.spec   2013-06-09 23:16:13.634169507 -0400
     3@@ -30,7 +30,7 @@
    44 Summary: The Kerberos network authentication system
    55 Name: krb5
    6  Version: 1.10.2
    7 -Release: 11%{?dist}
    8 +Release: 11%{?dist}.scripts.%{scriptsversion}
     6 Version: 1.11.3
     7-Release: 1%{?dist}
     8+Release: 1%{?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.10/krb5-1.10.2-signed.tar
     10 # http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.3-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -76,6 +76,8 @@
    13  Patch112: krb5-1.10-CVE-2013-1416.patch
    14  Patch113: krb5-fast-msg_type.patch
     12@@ -89,6 +89,8 @@
     13 Patch201: krb5-1.11.2-keycheck.patch
     14 Patch202: krb5-1.11.2-otp.patch
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
     
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 Group: System Environment/Libraries
    21 @@ -133,6 +135,7 @@
     21@@ -175,6 +177,7 @@
    2222 %package libs
    2323 Summary: The shared libraries used by Kerberos 5
    2424 Group: System Environment/Libraries
    2525+Provides: scripts-krb5-libs, scripts-krb5-libs%{?_isa}
     26 %if 0%{?rhel} == 6
     27 # Some of the older libsmbclient builds here incorrectly called
     28 # krb5_locate_kdc(), which was mistakenly exported in 1.9.
     29@@ -313,6 +316,7 @@
    2630 
    27  %description libs
    28  Kerberos is a network authentication system. The krb5-libs package
    29 @@ -259,6 +262,7 @@
    30  %patch111 -p1 -b .pkinit-agility
    31  %patch112 -p1 -b .CVE-2013-1416
    32  %patch113 -p1 -b .fast-msg_type
    33 +%patch1000 -p1 -b .kuserok
    34  rm src/lib/krb5/krb/deltat.c
     31 %patch201 -p1 -b .keycheck
     32 %patch202 -p1 -b .otp
     33+%patch1000 -p1 -b .kuserok 
    3534 
    36  gzip doc/*.ps
     35 # Take the execute bit off of documentation.
     36 chmod -x doc/krb5-protocol/*.txt
  • branches/fc19-dev/server/fedora/specs/openafs.spec.patch

    r2399 r2429  
    1 --- openafs.spec.orig   2012-11-10 05:22:28.754019405 -0500
    2 +++ openafs.spec        2012-11-10 12:45:48.679334955 -0500
     1--- openafs.spec.orig   2013-06-12 22:45:03.694169507 -0400
     2+++ openafs.spec        2013-06-12 22:46:25.703169507 -0400
    33@@ -4,7 +4,7 @@
    4  %define pkgvers 1.6.2
     4 %define pkgvers 1.6.3
    55 # for beta/rc releases make pkgrel 0.<tag>
    66 # for real releases make pkgrel 1 (or more for extra releases)
    7 -%define pkgrel 1
    8 +%define pkgrel 1.99.scripts.%{scriptsversion}
     7-%define pkgrel 0.pre3
     8+%define pkgrel 0.pre3.99.scripts.%{scriptsversion}
    99 
    1010 %{!?fedorakmod: %define fedorakmod 1}
    1111 %{!?build_dkmspkg: %define build_dkmspkg 1}
    12 @@ -249,9 +249,16 @@
     12@@ -249,9 +249,15 @@
    1313 %if %{build_modules}
    1414 BuildRequires: kernel-devel
     
    2121+Patch1002: openafs-systemd-crond.patch
    2222+Patch1003: openafs-systemd-csdb.patch
    23 +Patch1004: openafs-linux-3.8-enablement.patch
    2423+%define _default_patch_fuzz 2
    2524+
     
    9291 %else
    9392 
    94 @@ -698,6 +711,12 @@
     93@@ -698,6 +711,11 @@
    9594 #%setup -q -n %{srcdir}
    9695 %setup -q -b 1 -n %{srcdir}
     
    10099+%patch1002 -p1 -b .systemd-crond
    101100+%patch1003 -p1 -b .systemd-csdb
    102 +%patch1004 -p1 -b .3.8-enablement
    103101+
    104102 ##############################################################################
  • branches/fc19-dev/server/fedora/specs/openssh.spec.patch

    r2339 r2429  
    1 --- openssh.spec.orig   2012-06-18 18:16:43.764813595 -0400
    2 +++ openssh.spec        2012-06-18 18:24:40.478720527 -0400
     1--- openssh.spec.orig   2013-05-01 19:02:52.961058569 -0400
     2+++ openssh.spec        2013-05-01 19:15:58.952058569 -0400
    33@@ -74,7 +74,7 @@
    44 Summary: An open source implementation of SSH protocol versions 1 and 2
     
    99 URL: http://www.openssh.com/portable.html
    1010 #URL1: http://pamsshagentauth.sourceforge.net
    11  #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
    12 @@ -221,6 +221,7 @@
    13  #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
    14  # sctp
    15  #https://bugzilla.mindrot.org/show_bug.cgi?id=1873 => https://bugzilla.redhat.com/show_bug.cgi?id=668993
     11 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
     12@@ -187,6 +187,7 @@
     13 # add latest config.{sub,guess} to support aarch64 (#926284)
     14 Patch907: openssh-6.2p1-aarch64.patch
     15 
    1616+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
    1717 
    1818 License: BSD
    1919 Group: Applications/Internet
    20 @@ -271,6 +272,7 @@
     20@@ -238,6 +239,7 @@
    2121 Group: Applications/Internet
    2222 Requires: openssh = %{version}-%{release}
     
    2626 %package server
    2727 Summary: An open source SSH server daemon
    28 @@ -458,10 +460,12 @@
    29  %patch714 -p0 -b .null-xcrypt
     28@@ -407,10 +409,12 @@
     29 %patch713 -p1 -b .ctr-cavs
    3030 
    3131 %patch800 -p1 -b .gsskex
     
    3636 %patch900 -p1 -b .canohost
    3737-%patch901 -p1 -b .kuserok
    38 +# Remove the kuserok patch as it won't apply without patch800
     38+# Remove the kuserok patch as it won't apply without patch800 
    3939+# %patch901 -p1 -b .kuserok
    40  %patch902 -p1 -b .man-moduli
    41  %patch903 -p1 -b .ipqos
    42  
    43 @@ -469,6 +473,8 @@
     40 %patch905 -p1 -b .modpipe-cflags
     41 %patch906 -p1 -b .identityfile
     42 %patch907 -p1 -b .aarch64
     43@@ -419,6 +423,8 @@
    4444 # Nothing here yet
    4545 %endif
Note: See TracChangeset for help on using the changeset viewer.