Changeset 2246 for trunk


Ignore:
Timestamp:
Jun 27, 2012, 10:29:47 PM (10 years ago)
Author:
ezyang
Message:
Reintegrate Fedora 17 development branch into trunk.
Location:
trunk
Files:
3 deleted
24 edited
6 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/host/credit-card/host.py

    r2049 r2246  
    7070    ]
    7171
     72def drop_caches():
     73    with open("/proc/sys/vm/drop_caches", 'w') as f:
     74        f.write("1")
     75
    7276def mkdir_p(path): # it's like mkdir -p
    7377    try:
     
    98102        self.types = types
    99103    def __enter__(self):
     104        drop_caches()
    100105        self.dev = "/dev/%s/%s-root" % (HOST, self.guest)
    101106
     
    121126        os.rmdir(self.mount)
    122127        shell.call("kpartx", "-d", self.dev)
     128        drop_caches()
    123129
    124130def main():
  • trunk/locker

  • trunk/server/common/oursrc/php_scripts/php_scripts.h

    r1137 r2246  
    2828void scripts_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
    2929
    30 static function_entry scripts_functions[] = {
     30static zend_function_entry scripts_functions[] = {
    3131    {NULL, NULL, NULL}
    3232};
  • trunk/server/common/oursrc/sql-signup/sql-signup-pam

    r119 r2246  
    11#%PAM-1.0
    2 auth            sufficient      pam_succeed_if.so uid >= 500 quiet
     2auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
    33auth            include         config-util
    44account         include         config-util
  • trunk/server/common/oursrc/tokensys/scripts-afsagent-startup.in

    r2066 r2246  
    33/sbin/sysctl -q afs.GCPAGs=0
    44@fs_path@ setcrypt on
    5 @fs_path@ sysname 'amd64_fedora15_scripts' 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora15' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb60' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2'
     5@fs_path@ sysname 'amd64_fedora17_scripts' 'amd64_fedora15_scripts' 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora17' 'amd64_fedora15' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb60' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2'
    66
    77@fs_path@ setcell -nosuid -c athena
  • trunk/server/doc/install-howto.sh

    r2214 r2246  
    7777#   XXX We should make Kickstart work for test servers too
    7878
     79# Make sure selinux is disabled
     80    selinuxenabled || echo "selinux not enabled"
     81
    7982# Take updates, reboot if there's a kernel update.
    8083    yum update -y
     
    9699    \cp -a etc /
    97100    chmod 0440 /etc/sudoers
     101    grub2-mkconfig -o /boot/grub2/grub.cfg
    98102
    99103# [TEST] You'll need to fix some config now.  See bottom of document.
     104
     105# Stop /etc/resolv.conf from getting repeatedly overwritten by
     106# purging DNS servers from ifcfg-eth0 and ifcfg-eth1
     107    vim /etc/sysconfig/network-scripts/ifcfg-eth0
     108    vim /etc/sysconfig/network-scripts/ifcfg-eth1
    100109
    101110# Make sure network is working.  Kickstart should have
     
    246255    gem install $(gem list --no-version | grep -Fxvf - gem.txt)
    247256    # Also, we need to install the old rails version
    248     gem install -v=2.3.5 rails
     257    gem install -v=2.3.14 rails
    249258# These are in /usr
    250259
     
    340349    cat install-ldap
    341350
    342 # Enable lots of services
     351# Enable lots of services (currently in /etc checkout)
    343352    systemctl enable openafs-client.service
    344     systemctl enable dirsrv.service
     353    systemctl enable dirsrv.target
    345354    systemctl enable nslcd.service
    346355    systemctl enable nscd.service
    347356    systemctl enable postfix.service
    348     systemctl enable nrpe.service
     357    systemctl enable nrpe.service # chkconfig'd
    349358    systemctl enable httpd.service # not for [WIZARD]
    350359
    351360    systemctl start openafs-client.service
    352     systemctl start dirsrv.service
     361    systemctl start dirsrv.target
    353362    systemctl start nslcd.service
    354363    systemctl start nscd.service
     
    360369# among others, 'amd64_fedoraX_scripts' (vary X) and 'scripts'. If it's
    361370# not, you probably did a distro upgrade and should update
    362 # /etc/sysconfig/openafs (XXX this is wrong: figuring out new
    363 # systemd world order).
     371# tokensys (server/common/oursrc/tokensys/scripts-afsagent-startup.in)
    364372    fs sysname
    365373
     
    374382# (Note: this errors on XeTeX which is ok.)
    375383    fmtutil-sys --all
     384
     385# Check for unwanted setuid/setgid binaries
     386    find / -xdev -not -perm -o=x -prune -o -type f -perm /ug=s -print | grep -Fxvf /etc/scripts/allowed-setugid.list
    376387
    377388# Fix etc by making sure none of our config files got overwritten
  • trunk/server/doc/install-ldap

    r2068 r2246  
     1# b
    12# To set up a new LDAP server:
    23
     
    1415
    1516# Move the schema back
    16 cp -R /etc/dirsrv/slapd-scripts.bak/{.svn,*} /etc/dirsrv/slapd-scripts
     17cp -R /etc/dirsrv/slapd-scripts.bak/* /etc/dirsrv/slapd-scripts
    1718rm -Rf /etc/dirsrv/slapd-scripts.bak
    1819
     20# Check and make sure the sysconfig references the correct keytab
     21svn revert /etc/sysconfig/dirsrv-scripts
     22
    1923# Turn dirsrv off:
    20 systemctl stop dirsrv.service
     24systemctl stop dirsrv@scripts.service
    2125
    2226# Apply the following configuration changes.  If you're editing
     
    5256EOF;
    5357
    54 systemctl start dirsrv.service
     58systemctl start dirsrv@scripts.service
    5559
    5660ldapvi -b cn=config
     
    221225nsDS5ReplicaBindDN: uid=ldap/shining-armor.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
    222226nsDS5ReplicaBindDN: uid=ldap/golden-egg.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
     227nsDS5ReplicaBindDN: uid=ldap/miracle-cure.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
     228nsDS5ReplicaBindDN: uid=ldap/lucky-star.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
    223229nsds5ReplicaPurgeDelay: 604800
    224230nsds5ReplicaLegacyConsumer: off
  • trunk/server/doc/upgrade-tips

    r2066 r2246  
    172172--------------------
    173173
     174XXX out of date
    174175Update /etc/sysconfig/openafs with an extra amd64_fedoraX_scripts and
    175176amd64_fedoraX sysname.  The format should be evident from the existing
    176177entries.  [XXX There might be other things you want]
    177178
    178 6. Testing critical infrastructure
     1796. Bind to scripts-test
     180-----------------------
     181
     182First, make sure no other servers are bound to scripts-test (try ping).
     183Then, create /etc/sysconfig/network-scripts/ifcfg-eth0:0 based off of
     184/etc/sysconfig/network-scripts/ifcfg-eth0 but with the scripts-test
     185IP address 18.181.0.229.  Run `ifup eth0:0` to complete the change.
     186
     1877. Testing critical infrastructure
    179188----------------------------------
    180189
     
    188197    - http://pony.scripts.mit.edu
    189198
    190 7. Extra stuff
     1998. Extra stuff
    191200--------------
    192201
     
    202211emptying their .ini files in /etc/php.d.
    203212
    204 8. Sending announcements
     2139. Sending announcements
    205214------------------------
    206215
  • trunk/server/fedora/Makefile

    r2213 r2246  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 krb5.i686 httpd openssh redland-bindings rubygems
    22 hackage         = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
    23 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
     21upstream_yum    = krb5 krb5.i686 httpd openssh rubygems
     22hackage         = cgi-3001.1.8.2 unix-handle-0.0.0
     23upstream_hackage = ghc-cgi ghc-unix-handle
    2424upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs athena-aclocal discuss
    2525oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat fuse-better-mousetrapfs
     
    151151        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    152152        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    153         /usr/bin/mock -r scripts-fc15-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     153        /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    154154
    155155$(filter-out %.i686,$(oursrc)): %: setup
    156156        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    157157        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    158         /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     158        /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    159159
    160160$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
     
    162162$(filter %.i686,$(upstream)): %.i686: setup patch-specs
    163163        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    164         /usr/bin/mock -r scripts-fc15-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     164        /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    165165
    166166$(filter-out %.i686,$(upstream)): %: setup patch-specs
    167167        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    168         /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     168        /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    169169
    170170openafs-kernel: setup
    171171        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    172172        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec
    173         /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
     173        /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
    174174
    175175#sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong
  • trunk/server/fedora/config/etc/hosts

    r2066 r2246  
    202018.181.0.135    shining-armor.mit.edu shining-armor scripts9.mit.edu scripts9
    212118.181.0.141    golden-egg.mit.edu golden-egg scripts10.mit.edu scripts10
     2218.181.0.203    miracle-cure.mit.edu miracle-cure scripts11.mit.edu scripts11
     2318.181.0.204    lucky-star.mit.edu lucky-star scripts12.mit.edu scripts12
    2224
    2325172.21.0.57     better-mousetrap.mit.edu
     
    3133172.21.0.135    shining-armor.mit.edu
    3234172.21.0.141    golden-egg.mit.edu
     35172.21.0.203    miracle-cure.mit.edu
     36172.21.0.204    lucky-star.mit.edu
  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf

    r2066 r2246  
    1414    shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 \
    1515    golden-egg.mit.edu golden-egg g-e.mit.edu g-e scripts10.mit.edu scripts10 18.181.0.141 \
     16    miracle-cure.mit.edu miracle-cure m-c.mit.edu m-c scripts11.mit.edu scripts11 18.181.0.203 \
     17    lucky-star.mit.edu lucky-star l-s.mit.edu l-s scripts12.mit.edu scripts12 18.181.0.204 \
    1618    localhost 127.0.0.1 ::1
  • trunk/server/fedora/config/etc/scripts/allowed-filecaps.list

    r2173 r2246  
    1 /bin/ping
    2 /bin/ping6
     1/usr/bin/ping
     2/usr/bin/ping6
    33/usr/sbin/fping
    44/usr/sbin/fping6
  • trunk/server/fedora/config/etc/scripts/allowed-setugid.list

    r2173 r2246  
    1 /sbin/pam_timestamp_check
    2 /sbin/unix_chkpwd
     1/usr/sbin/pam_timestamp_check
     2/usr/sbin/unix_chkpwd
    33/usr/bin/at
    44/usr/bin/crontab
  • trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1

    r2132 r2246  
    141418.181.0.141 via 172.21.0.141
    151518.181.0.199 via 172.21.0.199
     1618.181.0.203 via 172.21.0.203
     1718.181.0.204 via 172.21.0.204
  • trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl

    r2188 r2246  
    136136        } elsif ($message =~ m|^Set /proc/self/oom_score_adj to |) {
    137137        } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) {
     138        } elsif ($message =~ m|^selinux sandbox not useful \[preauth\]$|) {
    138139        } else {
    139140            sendmsg($message, "scripts-spew");
  • trunk/server/fedora/config/etc/yum.repos.d/scripts.repo

    r2066 r2246  
    11[scripts]
    22name=Scripts
    3 baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15/
     3baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17/
    44enabled=1
    55gpgcheck=0
     
    77[scripts-testing]
    88name=Scripts Testing
    9 baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15-testing/
     9baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17-testing/
    1010enabled=0
    1111gpgcheck=0
  • trunk/server/fedora/specs/ghc-cgi.spec

    r2066 r2246  
    1 # For Haskell Packaging Guidelines see:
    2 # - https://fedoraproject.org/wiki/Packaging:Haskell
    3 # - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
     1# cabal2spec-0.25
     2# https://fedoraproject.org/wiki/Packaging:Haskell
     3# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
    44
    55%global pkg_name cgi
    66
    7 # common part of summary for all the subpackages
    87%global common_summary Haskell %{pkg_name} library
    98
    10 # main description used for all the subpackages
    119%global common_description A %{pkg_name} library for Haskell.
    12 
    13 # Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
    14 %global ghc_pkg_deps ghc-network-devel, ghc-parsec-devel, ghc-mtl-devel, ghc-MonadCatchIO-mtl-devel, ghc-xhtml-devel
    15 
    16 # foreign library dependencies (used for buildrequires and devel subpkg requires)
    17 #%%global ghc_pkg_c_deps @CDEP1@-devel
    1810
    1911Name:           ghc-%{pkg_name}
     
    2416Group:          System Environment/Libraries
    2517License:        BSD
     18# BEGIN cabal2spec
    2619URL:            http://hackage.haskell.org/package/%{pkg_name}
    2720Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
    28 # fedora ghc archs:
    29 ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
    30 BuildRequires:  ghc, ghc-doc, ghc-prof
    31 # macros for building haskell packages
    32 BuildRequires:  ghc-rpm-macros >= 0.7.3
    33 BuildRequires:  hscolour
    34 %{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
    35 %{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
     21ExclusiveArch:  %{ghc_arches}
     22BuildRequires:  ghc-Cabal-devel
     23BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
     24# END cabal2spec
     25BuildRequires:  ghc-network-prof
     26BuildRequires:  ghc-parsec-prof
     27BuildRequires:  ghc-mtl-prof
     28BuildRequires:  ghc-MonadCatchIO-mtl-prof
     29BuildRequires:  ghc-xhtml-prof
    3630
    3731%description
     
    5145
    5246
    53 # define the devel and prof subpkgs, devel post[un] scripts, and filelists:
    54 # ghc-%pkg_name{,devel,prof}.files
    55 %ghc_lib_package
     47# devel subpackage
     48%ghc_devel_package
     49
     50%ghc_devel_description
     51
     52
     53%ghc_devel_post_postun
     54
     55
     56%ghc_files LICENSE
    5657
    5758
    5859%changelog
     60* Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.2-0
     61- regenerated packaging with cabal2spec-0.25.5
     62
    5963* Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 3001.1.8.2-0
    6064- regenerated packaging with cabal2spec-0.22.5
  • trunk/server/fedora/specs/ghc-unix-handle.spec

    r2066 r2246  
    1 # For Haskell Packaging Guidelines see:
    2 # - https://fedoraproject.org/wiki/Packaging:Haskell
    3 # - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
     1# cabal2spec-0.25
     2# https://fedoraproject.org/wiki/Packaging:Haskell
     3# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
    44
    55%global pkg_name unix-handle
    66
    7 # common part of summary for all the subpackages
    87%global common_summary Haskell %{pkg_name} library
    98
    10 # main description used for all the subpackages
    119%global common_description A %{pkg_name} library for Haskell.
    12 
    13 # Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
    14 #%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel
    15 
    16 # foreign library dependencies (used for buildrequires and devel subpkg requires)
    17 #%%global ghc_pkg_c_deps @CDEP1@-devel
    1810
    1911Name:           ghc-%{pkg_name}
     
    2416Group:          System Environment/Libraries
    2517License:        BSD
     18# BEGIN cabal2spec
    2619URL:            http://hackage.haskell.org/package/%{pkg_name}
    2720Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
    28 # fedora ghc archs:
    29 ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
    30 BuildRequires:  ghc, ghc-doc, ghc-prof
    31 # macros for building haskell packages
    32 BuildRequires:  ghc-rpm-macros >= 0.7.3
    33 BuildRequires:  hscolour
    34 %{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
    35 %{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
     21ExclusiveArch:  %{ghc_arches}
     22BuildRequires:  ghc-Cabal-devel
     23BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
     24# END cabal2spec
    3625
    3726%description
     
    5140
    5241
    53 # define the devel and prof subpkgs, devel post[un] scripts, and filelists:
    54 # ghc-%pkg_name{,devel,prof}.files
    55 %ghc_lib_package
     42# devel subpackage
     43%ghc_devel_package
     44
     45%ghc_devel_description
     46
     47
     48%ghc_devel_post_postun
     49
     50
     51%ghc_files LICENSE
    5652
    5753
    5854%changelog
     55* Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0
     56- regenerated packaging with cabal2spec-0.25.5
     57
    5958* Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0.0-0
    6059- regenerated packaging with cabal2spec-0.22.5
  • trunk/server/fedora/specs/httpd.spec.patch

    r2157 r2246  
    1 --- httpd.spec.~1~      2012-02-13 09:46:36.000000000 -0500
    2 +++ httpd.spec  2012-03-26 01:33:53.247271289 -0400
    3 @@ -8,7 +8,7 @@
     1--- httpd.spec.~1~      2012-04-30 05:52:31.000000000 -0400
     2+++ httpd.spec  2012-05-22 23:31:12.397142763 -0400
     3@@ -9,7 +9,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    66 Version: 2.2.22
    7 -Release: 1%{?dist}
    8 +Release: 1%{?dist}.scripts.%{scriptsversion}
     7-Release: 4%{?dist}
     8+Release: 4%{?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 @@ -54,6 +54,15 @@
    13  Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
    14  Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
     12@@ -58,6 +58,14 @@
     13 Requires(postun): systemd-units
     14 Requires(post): systemd-units
    1515 
    1616+Provides: scripts-httpd = %{version}-%{release}
     
    2121+Patch1006: httpd-suexec-cloexec.patch
    2222+Patch1007: httpd-fixup-vhost.patch
    23 +Patch1008: httpd-sysv-deps.patch
    2423+
    2524 %description
    2625 The Apache HTTP Server is a powerful, efficient, and extensible
    2726 web server.
    28 @@ -64,6 +76,7 @@
     27@@ -68,6 +77,7 @@
    2928 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    3029 Requires: apr-devel, apr-util-devel, pkgconfig
     
    3433 %description devel
    3534 The httpd-devel package contains the APXS binary and other files
    36 @@ -102,6 +115,7 @@
     35@@ -106,6 +116,7 @@
    3736 Requires(post): openssl, /bin/cat
    3837 Requires(pre): httpd
     
    4241 
    4342 %description -n mod_ssl
    44 @@ -110,6 +124,11 @@
    45  Security (TLS) protocols.
    46  
    47  %prep
    48 +
    49 +# Horrible hack to patch the httpd.init file
    50 +cd $RPM_SOURCE_DIR
    51 +%patch1008 -p1 -b .sysv-deps
    52 +
    53  %setup -q
    54  %patch1 -p1 -b .apctl
    55  %patch2 -p1 -b .apxs
    56 @@ -128,6 +147,14 @@
     43@@ -133,6 +149,13 @@
    5744 # Patch in vendor/release string
    5845 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    6451+%patch1006 -p1 -b .cloexec
    6552+%patch1007 -p1 -b .fixup-vhost
    66 +# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec
    6753+
    6854 # Safety check: prevent build if defined MMN does not equal upstream MMN.
    6955 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    7056 if test "x${vmmn}" != "x%{mmn}"; then
    71 @@ -175,10 +205,12 @@
     57@@ -193,10 +217,12 @@
    7258         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    7359        --enable-suexec --with-suexec \
  • trunk/server/fedora/specs/krb5.spec.patch

    r2187 r2246  
    1 --- krb5.spec.~1~       2012-03-08 16:20:41.000000000 -0500
    2 +++ krb5.spec   2012-04-01 22:07:14.834013302 -0400
    3 @@ -6,7 +6,7 @@
     1--- krb5.spec.orig      2012-06-17 19:29:24.140005717 -0400
     2+++ krb5.spec   2012-06-17 19:30:47.834405053 -0400
     3@@ -20,7 +20,7 @@
    44 Summary: The Kerberos network authentication system
    55 Name: krb5
    6  Version: 1.9.3
    7 -Release: 1%{?dist}
    8 +Release: 1%{?dist}.scripts.%{scriptsversion}
     6 Version: 1.10.2
     7-Release: 2%{?dist}
     8+Release: 2%{?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.9/krb5-1.9.3-signed.tar
     10 # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.2-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -64,6 +64,8 @@
    13  Patch102: krb5-1.9-7048.patch
    14  Patch103: krb5-kvno-230379.patch
     12@@ -69,6 +69,8 @@
     13 Patch105: krb5-kvno-230379.patch
     14 Patch106: krb5-1.10.2-keytab-etype.patch
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
     
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 Group: System Environment/Libraries
    21 @@ -113,6 +115,7 @@
     21@@ -126,6 +128,7 @@
    2222 %package libs
    2323 Summary: The shared libraries used by Kerberos 5
     
    2727 %description libs
    2828 Kerberos is a network authentication system. The krb5-libs package
    29 @@ -219,6 +222,7 @@
    30  %patch101 -p1 -b .7047
    31  %patch102 -p1 -b .7048
    32  %patch103 -p1 -b .kvno
     29@@ -245,6 +248,7 @@
     30 %patch103 -p0 -b .gcc47
     31 %patch105 -p1 -b .kvno
     32 %patch106 -p1 -b .keytab-etype
    3333+%patch1000 -p1 -b .kuserok
     34 rm src/lib/krb5/krb/deltat.c
     35 
    3436 gzip doc/*.ps
    35  
    36  sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
  • trunk/server/fedora/specs/openssh.spec.patch

    r2185 r2246  
    1 --- openssh.spec.~1~    2012-02-14 11:06:13.000000000 -0500
    2 +++ openssh.spec        2012-02-25 13:02:28.660616538 -0500
    3 @@ -78,7 +78,7 @@
     1--- openssh.spec.orig   2012-06-18 18:16:43.764813595 -0400
     2+++ openssh.spec        2012-06-18 18:24:40.478720527 -0400
     3@@ -82,7 +82,7 @@
    44 Summary: An open source implementation of SSH protocol versions 1 and 2
    55 Name: openssh
     
    1010 #URL1: http://pamsshagentauth.sourceforge.net
    1111 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
    12 @@ -92,6 +92,7 @@
    13  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
     12@@ -218,6 +218,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
    1616+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
    1717 
    18  Patch100: openssh-5.6p1-wIm.patch
    19  Patch0: openssh-5.6p1-redhat.patch
    20 @@ -214,6 +215,7 @@
    21  Requires(pre): /usr/sbin/useradd
    22  Requires: pam >= 1.0.1-3
     18 License: BSD
     19 Group: Applications/Internet
     20@@ -271,6 +272,7 @@
     21 Group: Applications/Internet
     22 Requires: openssh = %{version}-%{release}
    2323 Requires: fipscheck-lib%{_isa} >= 1.3.0
    2424+Provides: scripts-openssh-server
    2525 
    26  %if %{ldap}
    27  %package ldap
    28 @@ -333,6 +335,8 @@
    29  %patch83 -p0 -b .oomkiller
    30  %patch84 -p1 -b .legacy
     26 %package server
     27 Summary: An open source SSH server daemon
     28@@ -456,15 +458,19 @@
     29 %patch713 -p1 -b .ctr-cavs
     30 
     31 %patch800 -p1 -b .gsskex
     32-%patch801 -p1 -b .force_krb
     33+# Remove force_krb as it conflicts with admof
     34+# %patch801 -p1 -b .force_krb
     35 
     36 %patch900 -p1 -b .canohost
     37-%patch901 -p1 -b .kuserok
     38+# Remove the kuserok patch as it won't apply without patch800
     39+# %patch901 -p1 -b .kuserok
     40 
     41 %if 0
     42 # Nothing here yet
     43 %endif
    3144 
    3245+%patch1001 -p1 -b .gssapi-env
  • trunk/server/fedora/specs/rubygems.spec.patch

    r2189 r2246  
    1 --- rubygems.spec.~1~   2012-04-20 14:46:27.000000000 -0400
    2 +++ rubygems.spec       2012-05-03 14:12:52.421863447 -0400
    3 @@ -15,7 +15,7 @@
     1--- rubygems.spec.~1~   2012-04-28 04:01:50.000000000 -0400
     2+++ rubygems.spec       2012-05-22 23:47:16.001145101 -0400
     3@@ -18,7 +18,7 @@
    44 Summary:       The Ruby standard for packaging ruby libraries
    55 Name:          rubygems
    6  Version:       1.7.2
    7 -Release:       5%{?dist}
    8 +Release:       5%{?dist}.scripts.%{scriptsversion}
     6 Version:       1.8.24
     7-Release:       1%{?dist}
     8+Release:       1%{?dist}.scripts.%{scriptsversion}
    99 Group:         Development/Libraries
    10  # No GPL version is specified.
    11  License:       Ruby or GPL+
    12 @@ -42,6 +42,9 @@
    13  # Insecure connection to SSL repository fix
    14  Patch10:       rubygems-1.x.x-ssl-connection-don_t-revert.patch
     10 License:       Ruby or MIT
     11 
     12@@ -52,6 +52,8 @@
     13 # https://github.com/rubygems/rubygems/issues/210
     14 Patch109:      rubygems-1.8.11-binary-extensions.patch
    1515 
    1616+Provides: scripts-rubygems = %{version}-%{release}
    1717+Patch1000: rubygems-rails-require-thread.patch
    18 +
    19  Requires:      ruby(abi) = 1.8
    20  Requires:      ruby >= 1.8.7
    21  Requires:      ruby-rdoc
    22 @@ -83,6 +86,8 @@
    23  %patch7 -p1 -b .esc.skip
    24  %patch10 -p1 -b .ssl
     18 
     19 Requires:      ruby(abi) = 1.9.1
     20 Requires:      rubygem(rdoc) >= 3.9.4
     21@@ -97,6 +99,8 @@
     22 %patch105 -p1 -b .uninst
     23 %patch109 -p1 -b .bindir
    2524 
    2625+%patch1000 -p1 -b .thread
  • trunk/server/fedora/specs/scripts-static-cat.spec

    r2122 r2246  
    1 # For Haskell Packaging Guidelines see:
    2 # - https://fedoraproject.org/wiki/Packaging:Haskell
    3 # - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
     1# cabal2spec-0.25
     2# https://fedoraproject.org/wiki/Packaging:Haskell
     3# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
    44
    55# Link Haskell libs statically for 3x faster startup speed.
     
    1313Group:          Applications/System
    1414License:        GPL
     15# BEGIN cabal2spec
    1516URL:            http://scripts.mit.edu/
    1617Source0:        %{name}.tar.gz
    17 # fedora ghc archs:
    18 ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
    19 BuildRequires:  ghc-devel
    20 # macros for building haskell packages
    21 BuildRequires:  ghc-rpm-macros >= 0.7.0
    22 BuildRequires:  ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel
     18ExclusiveArch:  %{ghc_arches}
     19BuildRequires:  ghc-Cabal-devel
     20BuildRequires:  ghc-rpm-macros
     21# END cabal2spec
     22BuildRequires:  ghc-bytestring-devel
     23BuildRequires:  ghc-cgi-devel >= 3001.1.8
     24BuildRequires:  ghc-containers-devel
     25BuildRequires:  ghc-filepath-devel
     26BuildRequires:  ghc-MonadCatchIO-mtl-devel
     27BuildRequires:  ghc-old-locale-devel
     28BuildRequires:  ghc-time-devel
     29BuildRequires:  ghc-unix-devel
     30BuildRequires:  ghc-unix-handle-devel
    2331
    2432%description
     
    3947
    4048%files
    41 %defattr(-,root,root,-)
    4249%attr(755,root,root) %{_bindir}/static-cat
    4350
    4451
    4552%changelog
     53* Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 0.0-0
     54- regenerated packaging with cabal2spec-0.25.5
     55
    4656* Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0-0
    4757- regenerated packaging with cabal2spec-0.22.5
Note: See TracChangeset for help on using the changeset viewer.