Changeset 2066 for trunk/server/fedora


Ignore:
Timestamp:
Nov 22, 2011, 12:45:17 AM (11 years ago)
Author:
achernya
Message:
Merge branches/fc15-dev to trunk
Location:
trunk
Files:
7 deleted
40 edited
11 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/server/fedora/Makefile

    r2001 r2066  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 krb5.i686 httpd openssh curl redland-bindings
    22 hackage         = MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0
     21upstream_yum    = krb5 krb5.i686 httpd openssh redland-bindings rubygems
     22hackage         = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
    2323upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
    24 upstream        = openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker zephyr zephyr.i686 python-zephyr athena-aclocal discuss
     24upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr 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
    2626allsrc          = $(upstream) $(oursrc)
     
    4040server_url      = "http://web.mit.edu/scripts/src"
    4141server_arch     = "fedora.stable"
    42 #openafs_url    = "http://dl.openafs.org/dl/openafs/1.4.12/openafs-1.4.12-1.1.2.src.rpm"
    43 openafs_url     = "http://web.mit.edu/~scripts/yum-repos/rpm-fc13/openafs-1.4.12.1-1.0.pre3.src.rpm"
    44 clusterglue_url = "http://kojipkgs.fedoraproject.org/packages/cluster-glue/1.0/0.11.b79635605337.hg.fc12/src/cluster-glue-1.0-0.11.b79635605337.hg.fc12.src.rpm"
    45 heartbeat_url   = "http://kojipkgs.fedoraproject.org/packages/heartbeat/3.0.0/0.5.0daab7da36a8.hg.fc12/src/heartbeat-3.0.0-0.5.0daab7da36a8.hg.fc12.src.rpm"
    46 pacemaker_url   = "http://kojipkgs.fedoraproject.org/packages/pacemaker/1.0.5/5.fc12/src/pacemaker-1.0.5-5.fc12.src.rpm"
    47 zephyr_url      = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.tar.gz"
     42openafs_url     = "http://dl.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-1.src.rpm"
     43zephyr_url      = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.1.tar.gz"
    4844
    4945PKG             = $(patsubst %.i686,%,$@)
     
    7470        cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
    7571        wget -P $(dload) $(openafs_url)
    76         wget -P $(dload) $(clusterglue_url)
    77         wget -P $(dload) $(heartbeat_url)
    78         wget -P $(dload) $(pacemaker_url)
    7972        wget -P $(dload) $(zephyr_url)
    8073        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
    81         cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
    82         cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
    83         cp $(oursrcdir)/discuss/* $(tmp_src)
    8474        cabal update
    8575        cabal fetch $(hackage)
     
    8878        touch download_stamp
    8979
     80        cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
     81        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
     82        cp $(oursrcdir)/discuss/* $(tmp_src)
    9083%.src.rpm:
    9184        wget -q -nv -N -B $(server_url) -nd -nH -P $(dload) $(server_url)/$*.src.rpm
     
    10194        cp ${specs}/*.spec $(tmp_specs)
    10295
     96# Remove old .orig files so we're not mislead
    10397patch-specs: install-srpms
    10498        @cd ${tmp_specs}; \
    10599        list=`ls ${specs}/*.spec.patch`; \
     100        rm -f *.orig; \
     101        rm -f *.spec.~*~; \
    106102        for i in $$list; do \
    107                 patch < $$i; \
     103                patch -bV numbered < $$i; \
    108104        done; \
    109105        list2=`svn ls ${oursrcdir}`; \
     
    150146        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    151147        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    152         /usr/bin/mock -r scripts-fc13-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     148        /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`
    153149
    154150$(filter-out %.i686,$(oursrc)): %: setup
    155151        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    156152        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    157         /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     153        /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    158154
    159155$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
     
    161157$(filter %.i686,$(upstream)): %.i686: setup patch-specs
    162158        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    163         /usr/bin/mock -r scripts-fc13-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     159        /usr/bin/mock -r scripts-fc15-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    164160
    165161$(filter-out %.i686,$(upstream)): %: setup patch-specs
    166162        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    167         /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     163        /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    168164
    169165openafs-kernel: setup
    170166        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    171167        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec
    172         /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
     168        /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
    173169
    174170#sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong
     
    188184        fi
    189185
    190 # The following packages are needed for our packages
    191 basic-deps      = kernel-devel rpm-build rpmdevtools mock gcc autoconf patch krb5-workstation glibc-devel.i686 glibc-devel libtool libgcc.i686
    192 oursrc-deps     = hesinfo openldap-clients openldap-devel.i686 php-devel
    193 httpdmods-deps  = httpd-devel
    194 httpd-deps      = xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel
    195 krb5-deps       = bison ncurses-devel texinfo keyutils-libs-devel texinfo-tex texlive-latex libss-devel rsh
    196 openafs-deps    = pam-devel automake
    197 moira-deps      = e2fsprogs-devel
    198 zephyr-deps     = hesiod-devel libss-devel krb5-devel readline-devel
    199 openssh-deps    = gtk2-devel libX11-devel autoconf automake openssl-devel perl zlib-devel audit-libs-devel util-linux groff man pam-devel tcp_wrappers-devel krb5-devel libselinux-devel audit-libs xauth pango-devel cairo-devel libedit-devel nss-devel fipscheck-devel
    200 php-deps        = bzip2-devel curl-devel gmp-devel libstdc++-devel sqlite-devel gcc-c++ libc-client-devel mysql-devel postgresql-devel unixODBC-devel libxml2-devel net-snmp-devel libxslt-devel libxml2-devel libXpm-devel libjpeg-devel t1lib-devel libmcrypt-devel mhash-devel libtidy-devel freetds-devel aspell-devel recode-devel
    201 haskell-deps    = cabal-install
    202 install-deps:
    203         yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(moira-deps) $(zephyr-deps) $(openssh-deps) $(php-deps) $(haskell-deps)
    204186# XXX: We need to figure out what's going on with compat-readline43
    205187#       rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm
     
    207189
    208190fedora:
    209         make install-deps
    210191        make upstream
    211192        rpm -ivh $(out_rpms)/`uname -m`/openafs-devel*.rpm
  • trunk/server/fedora/config/etc/cron.d/slapdagent

    r1716 r2066  
    11KRB5CCNAME=/var/run/dirsrv/krb5cc
    22MAILTO=scripts-root@mit.edu
    3 0 */3 * * * fedora-ds /usr/kerberos/bin/kinit -k -t /etc/dirsrv/keytab ldap/$(hostname)
     30 */3 * * * fedora-ds /usr/bin/kinit -k -t /etc/dirsrv/keytab ldap/$(hostname)
  • trunk/server/fedora/config/etc/hosts

    r1684 r2066  
    181818.181.0.234    busy-beaver.mit.edu busy-beaver scripts7.mit.edu scripts7
    191918.181.0.235    real-mccoy.mit.edu real-mccoy scripts8.mit.edu scripts8
    20 18.181.0.135    shining-armor.mit.edu shining-armor # scripts9.mit.edu scripts9
     2018.181.0.135    shining-armor.mit.edu shining-armor scripts9.mit.edu scripts9
     2118.181.0.141    golden-egg.mit.edu golden-egg scripts10.mit.edu scripts10
    2122
    2223172.21.0.57     better-mousetrap.mit.edu
     
    2930172.21.0.235    real-mccoy.mit.edu
    3031172.21.0.135    shining-armor.mit.edu
     32172.21.0.141    golden-egg.mit.edu
  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-special.conf

    r1483 r2066  
    11Alias /__scripts/heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
    2 Alias /__scripts/django/media /usr/lib/python2.6/site-packages/django/contrib/admin/media
     2Alias /__scripts/django/media /usr/lib/python2.7/site-packages/django/contrib/admin/media
    33Alias /__scripts /afs/athena.mit.edu/contrib/scripts/www
    44
     
    99</Directory>
    1010
    11 <Directory /usr/lib/python2.6/site-packages/django/contrib/admin/media>
     11<Directory /usr/lib/python2.7/site-packages/django/contrib/admin/media>
    1212    <Files *>
    1313        SetHandler none
  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf

    r1700 r2066  
    11ServerName scripts.mit.edu
    2 ServerAlias scripts 18.181.0.43 scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 scripts-test.mit.edu scripts-test 18.181.0.229 better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 whole-enchilada.mit.edu whole-enchilada w-e.mit.edu w-e scripts5.mit.edu scripts5 18.181.0.236 pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 localhost 127.0.0.1 ::1
     2ServerAlias \
     3    scripts 18.181.0.43 \
     4    scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 \
     5    scripts-test.mit.edu scripts-test 18.181.0.229 \
     6    better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 \
     7    old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 \
     8    bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 \
     9    cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 \
     10    whole-enchilada.mit.edu whole-enchilada w-e.mit.edu w-e scripts5.mit.edu scripts5 18.181.0.236 \
     11    pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 \
     12    busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 \
     13    real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 \
     14    shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 \
     15    golden-egg.mit.edu golden-egg g-e.mit.edu g-e scripts10.mit.edu scripts10 18.181.0.141 \
     16    localhost 127.0.0.1 ::1
  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost.conf

    r811 r2066  
    11DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
    22SuExecUserGroup scripts users
     3UserDir enabled
    34UserDir web_scripts
    45# Comment the following line out to take the machine out of the LVS pool
  • trunk/server/fedora/config/etc/krb5.conf

    r708 r2066  
    11[libdefaults]
     2        allow_weak_crypto = true
    23        default_realm = ATHENA.MIT.EDU
    34# The following krb5.conf variables are only for MIT Kerberos.
  • trunk/server/fedora/config/etc/php.d/_scripts.ini

    r1362 r2066  
    33cgi.force_redirect = 0
    44memory_limit = 1024M
     5date.timezone = America/New_York
  • trunk/server/fedora/config/etc/php.d/tidy.ini

    r813 r2066  
    1 
  • trunk/server/fedora/config/etc/pki/tls/certs/nudelta.pem

  • trunk/server/fedora/config/etc/postfix/main.cf

    r1868 r2066  
    1717recipient_delimiter = +
    1818inet_interfaces = all
    19 readme_directory = /usr/share/doc/postfix-2.7.4/README_FILES
    20 sample_directory = /usr/share/doc/postfix-2.7.4/samples
     19readme_directory = /usr/share/doc/postfix-2.8.5/README_FILES
     20sample_directory = /usr/share/doc/postfix-2.8.5/samples
    2121sendmail_path = /usr/sbin/sendmail
    2222html_directory = no
  • trunk/server/fedora/config/etc/rc.d/rc.local

    • Property svn:executable set to *
    r227 r2066  
    33touch /var/lock/subsys/local
    44
    5 if [ -r "/afs/athena.mit.edu" ]; then
    6         /sbin/service postfix start
    7 fi
    8 
    95/bin/mkdir -pm 1773 /tmp/sessions
  • trunk/server/fedora/config/etc/scripts/allowed-setugid.list

    r1917 r2066  
    1 /bin/ping
    2 /bin/ping6
    31/sbin/pam_timestamp_check
    42/sbin/unix_chkpwd
  • trunk/server/fedora/config/etc/ssh/shosts.equiv

    r1702 r2066  
    88shining-armor.mit.edu
    99whole-enchilada.mit.edu
     10golden-egg.mit.edu
    1011172.21.0.53
    1112172.21.0.57
     
    1718172.21.0.135
    1819172.21.0.236
     20172.21.0.141
  • trunk/server/fedora/config/etc/ssh/ssh_known_hosts

    r1703 r2066  
    88whole-enchilada.mit.edu,whole-enchilada,w-e.mit.edu,w-e,scripts5.mit.edu,scripts5,18.181.0.236,172.21.0.236 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
    99shining-armor.mit.edu,shining-armor,s-a.mit.edu,s-a,scripts9.mit.edu,scripts9,18.181.0.135,172.21.0.135 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
     10golden-egg.mit.edu.golden-egg,g-e.mit.edu,g-e,scripts10.mit.edu,scripts10,18.181.0.141,172.21.0.141 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuEpkEgaIgjK7F1gV81lLSYTwSqIZX/9IJs37VaJCsJFv3D86uuJSdfI3Y94fPn2OH6AxfdaqGNksVdi27mKQfzvCB4ogjQgxmM391MIDLd+izZDY0YvCb4DqJLMJUpX49cNUMkj+/rJg1O0K2w/lb8DGr7wdoLSPKCUJNJv5WMMDxpFL253lPELsmnds4T+R6LpTt6W9+FalHl84me51sEjV9PbmhcTaNwuoJStAjhrKPfgHHDIKNyCUvaVkoHPXEsdzz00yY7i57djyZlzPV/jM7LKar+Xw2LB0Z3098IQcdbD8zmz2DdakPTlShxavNPC6kZDZ3WVqziC+bszaSQ==
  • trunk/server/fedora/config/etc/ssh/sshd_config

    r1703 r2066  
    2020IgnoreRhosts yes
    2121IgnoreUserKnownHosts yes
    22 DenyUsers root@old-faithful.mit.edu root@better-mousetrap.mit.edu root@bees-knees.mit.edu root@cats-whiskers.mit.edu root@pancake-bunny.mit.edu root@busy-beaver.mit.edu root@real-mccoy.mit.edu root@whole-enchilada.mit.edu root@shining-armor.mit.edu
     22DenyUsers root@old-faithful.mit.edu root@better-mousetrap.mit.edu root@bees-knees.mit.edu root@cats-whiskers.mit.edu root@pancake-bunny.mit.edu root@busy-beaver.mit.edu root@real-mccoy.mit.edu root@whole-enchilada.mit.edu root@shining-armor.mit.edu root@golden-egg.mit.edu
  • trunk/server/fedora/config/etc/sysconfig/dirsrv

    r1716 r2066  
    3232# slapdagent cronjob) -- geofft 30 October 2010
    3333KRB5CCNAME=/var/run/dirsrv/krb5cc; export KRB5CCNAME
    34 /usr/kerberos/bin/kinit -k -t "$KRB5_KTNAME" ldap/"$(hostname)"
     34/usr/bin/kinit -k -t "$KRB5_KTNAME" ldap/"$(hostname)"
    3535chown --reference="$KRB5_KTNAME" "$KRB5CCNAME"
    3636
  • trunk/server/fedora/config/etc/sysconfig/httpd

    r759 r2066  
    2121#
    2222#HTTPD_LANG=C
     23
     24#
     25# When stopping the server a 10 second timeout is allowed before
     26# forcibly terminating the parent process (with a SIGKILL signal).
     27# To allow a longer delay, set the STOP_TIMEOUT variable.
     28#
     29#STOP_TIMEOUT=10
     30#
  • trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1

    r1789 r2066  
    121218.181.0.235 via 172.21.0.235
    131318.181.0.135 via 172.21.0.135
     1418.181.0.141 via 172.21.0.141
  • trunk/server/fedora/config/etc/sysconfig/openafs

    r1993 r2066  
    11AFSD_ARGS="-afsdb -dynroot -fakestat-all -stat 25000 -daemons 100 -volumes 4000 -files 400000 -chunksize 19"
    22BOSSERVER_ARGS=
    3 
    4 postinit () {
    5         /sbin/sysctl -q afs.GCPAGs=0
    6         /usr/bin/fs setcrypt on
    7         case "$(lsb_release -cs)" in
    8           Moonshine)
    9             /usr/bin/fs sysname 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora7' 'amd64_linux26' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' 'i386_linux1' ;;
    10           Sulphur)
    11             /usr/bin/fs sysname 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
    12           Leonidas)
    13             /usr/bin/fs sysname 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
    14           Goddard)
    15             /usr/bin/fs sysname 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
    16           *)
    17             echo "Warning: unknown platform. AFS sysname not set."
    18         esac
    19         /usr/bin/fs setcell -nosuid -c athena
    20 }
    21 AFS_POST_INIT=postinit
  • trunk/server/fedora/config/etc/sysconfig/sysstat

    r72 r2066  
    1 # How long to keep log files (days), maximum is a month
     1# sysstat-9.0.6.1 configuration file.
     2
     3# How long to keep log files (in days).
     4# If value is greater than 28, then log files are kept in
     5# multiple directories, one for each month.
    26HISTORY=30
     7
     8# Compress (using gzip or bzip2) sa and sar files older than (in days):
     9COMPRESSAFTER=10
     10
     11# Parameters for system activity collector (see sadc man-page) which
     12# are used for the generation of log files
     13SADC_OPTIONS="-S DISK"
  • trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl

    r1747 r2066  
    3232sub buildKeyMap($) {
    3333    my ($file) = @_;
    34     open (KEYS, $file) or warn "Couldn't open $file: $!";
     34    open (KEYS, $file) or (warn "Couldn't open $file: $!\n" and return);
    3535    while (<KEYS>) {
    3636        chomp;
     
    5858buildKeyMap("/root/.ssh/authorized_keys2");
    5959
    60 while (1) {
    61     my @message = scalar(<>);
     60my @message;
     61
     62while (my $line = <>) {
     63    @message = $line;
    6264    eval {
    6365        local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required
     
    8082        } elsif ($message =~ m|Root (\S+) shell|) {
    8183            sendmsg($message);
    82         } elsif ($message =~ m|session \S+ for user (\S+)|) {
    83             sendmsg($message) if exists $USERS{$1};
     84        } elsif ($message =~ m|pam_unix\(([^:]+):session\): session \S+ for user (\S+)|) {
     85            sendmsg($message) if $1 ne "cron" and exists $USERS{$2};
    8486        } elsif ($message =~ m|^Found matching (\w+) key: (\S+)|) {
    8587            if ($sshkeys{$2}) {
     
    117119        } elsif ($message =~ m|^ *root : TTY=|) {
    118120        } elsif ($message =~ m|^Set /proc/self/oom_adj to |) {
     121        } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) {
    119122        } else {
    120123            sendmsg($message, "scripts-spew");
  • trunk/server/fedora/config/etc/syslog-ng/syslog-ng.conf

    r1259 r2066  
     1@version:3.2
     2
    13# syslog-ng configuration file.
    24#
     
    810
    911options {
    10         sync (0);
     12        flush_lines (0);
    1113        time_reopen (10);
    1214        log_fifo_size (1000);
     
    1618        create_dirs (no);
    1719        keep_hostname (yes);
     20        stats_freq (0);
    1821};
    1922
    2023source s_sys {
    21         file ("/proc/kmsg" log_prefix("kernel: "));
     24        file ("/proc/kmsg" program_override("kernel: "));
    2225        unix-stream ("/dev/log");
    2326        internal();
     
    2831destination d_mesg { file("/var/log/messages"); };
    2932destination d_auth { file("/var/log/secure"); };
    30 destination d_mail { file("/var/log/maillog" sync(10)); };
     33destination d_mail { file("/var/log/maillog" flush_lines(10)); };
    3134destination d_spol { file("/var/log/spooler"); };
    3235destination d_boot { file("/var/log/boot.log"); };
  • trunk/server/fedora/config/etc/yum.conf

    r1722 r2066  
    99plugins=1
    1010metadata_expire=1800
    11 installonlypkgs=kernel kernel-devel kmod-openafs
     11installonlypkgs=kernel kernel-devel kmod-openafs ghc-cgi ghc-cgi-devel
    1212
    1313# PUT YOUR REPOS HERE OR IN separate files named file.repo
  • trunk/server/fedora/config/etc/yum.repos.d/scripts.repo

    r1888 r2066  
    11[scripts]
    22name=Scripts
    3 baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc13/
     3baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15/
    44enabled=1
    55gpgcheck=0
     
    77[scripts-testing]
    88name=Scripts Testing
    9 baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc13-testing/
     9baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15-testing/
    1010enabled=0
    1111gpgcheck=0
  • trunk/server/fedora/config/etc/yum/post-actions/statoverride.action

    r1926 r2066  
    2222/usr/bin/write:install:chmod ug-s /usr/bin/write
    2323/usr/bin/Xorg:install:chmod ug-s /usr/bin/Xorg
    24 /usr/kerberos/bin/ksu:install:chmod ug-s /usr/kerberos/bin/ksu
     24/usr/bin/ksu:install:chmod ug-s /usr/bin/ksu
    2525/usr/lib64/nspluginwrapper/plugin-config:install:chmod ug-s /usr/lib64/nspluginwrapper/plugin-config
    2626/usr/lib64/vte/gnome-pty-helper:install:chmod ug-s /usr/lib64/vte/gnome-pty-helper
     27/usr/libexec/kde4/kpac_dhcp_helper:install:chmod ug-s /usr/libexec/kde4/kpac_dhcp_helper
    2728/usr/sbin/ccreds_chkpwd:install:chmod ug-s /usr/sbin/ccreds_chkpwd
    2829/usr/sbin/userisdnctl:install:chmod ug-s /usr/sbin/userisdnctl
    2930/usr/sbin/usernetctl:install:chmod ug-s /usr/sbin/usernetctl
     31/usr/bin/pkexec:install:chmod ug-s /usr/bin/pkexec
  • trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec

    r1693 r2066  
     1# For Haskell Packaging Guidelines see:
     2# - https://fedoraproject.org/wiki/Packaging:Haskell
     3# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
     4
    15%global pkg_name MonadCatchIO-mtl
    26
     7# common part of summary for all the subpackages
    38%global common_summary Haskell %{pkg_name} library
    49
     10# main description used for all the subpackages
    511%global common_description A %{pkg_name} library for Haskell.
    612
    7 # add any Haskell library dependencies here:
     13# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
    814%global ghc_pkg_deps ghc-mtl-devel
    915
    10 # add any foreign library dependencies here:
     16# foreign library dependencies (used for buildrequires and devel subpkg requires)
    1117#%%global ghc_pkg_c_deps @CDEP1@-devel
    1218
    13 %bcond_without shared
    14 
    15 # debuginfo is not useful for ghc
    16 %global debug_package %{nil}
    17 
    1819Name:           ghc-%{pkg_name}
    19 Version:        0.3.0.1
     20Version:        0.3.0.2
    2021Release:        0.%{scriptsversion}%{?dist}
    2122Summary:        %{common_summary}
     
    2324Group:          System Environment/Libraries
    2425License:        BSD
    25 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
     26URL:            http://hackage.haskell.org/package/%{pkg_name}
    2627Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
    27 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    2828# fedora ghc archs:
    29 ExclusiveArch:  %{ix86} x86_64 ppc alpha
     29ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
    3030BuildRequires:  ghc, ghc-doc, ghc-prof
    31 BuildRequires:  ghc-rpm-macros >= 0.7.0
     31# macros for building haskell packages
     32BuildRequires:  ghc-rpm-macros >= 0.7.3
     33BuildRequires:  hscolour
    3234%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
    3335%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
     
    3537%description
    3638%{common_description}
    37 %if %{with shared}
    38 This package provides the shared library.
    39 %endif
    40 
    41 
    42 %{?ghc_lib_package}
    4339
    4440
     
    5248
    5349%install
    54 rm -rf $RPM_BUILD_ROOT
    5550%ghc_lib_install
    5651
    5752
    58 %clean
    59 rm -rf $RPM_BUILD_ROOT
     53# define the devel and prof subpkgs, devel post[un] scripts, and filelists:
     54# ghc-%pkg_name{,devel,prof}.files
     55%ghc_lib_package
    6056
    6157
    6258%changelog
     59* Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.3.0.2-0
     60- regenerated packaging with cabal2spec-0.22.5
     61
    6362* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.3.0.1-0
    6463- initial packaging for Fedora automatically generated by cabal2spec-0.22.1
  • trunk/server/fedora/specs/ghc-cgi.spec

    r1693 r2066  
     1# For Haskell Packaging Guidelines see:
     2# - https://fedoraproject.org/wiki/Packaging:Haskell
     3# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
     4
    15%global pkg_name cgi
    26
     7# common part of summary for all the subpackages
    38%global common_summary Haskell %{pkg_name} library
    49
     10# main description used for all the subpackages
    511%global common_description A %{pkg_name} library for Haskell.
    612
    7 # add any Haskell library dependencies here:
     13# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
    814%global ghc_pkg_deps ghc-network-devel, ghc-parsec-devel, ghc-mtl-devel, ghc-MonadCatchIO-mtl-devel, ghc-xhtml-devel
    915
    10 # add any foreign library dependencies here:
     16# foreign library dependencies (used for buildrequires and devel subpkg requires)
    1117#%%global ghc_pkg_c_deps @CDEP1@-devel
    1218
    13 %bcond_without shared
    14 
    15 # debuginfo is not useful for ghc
    16 %global debug_package %{nil}
    17 
    1819Name:           ghc-%{pkg_name}
    19 Version:        3001.1.8.1
     20Version:        3001.1.8.2
    2021Release:        0.%{scriptsversion}%{?dist}
    2122Summary:        %{common_summary}
     
    2324Group:          System Environment/Libraries
    2425License:        BSD
    25 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
     26URL:            http://hackage.haskell.org/package/%{pkg_name}
    2627Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
    27 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    2828# fedora ghc archs:
    29 ExclusiveArch:  %{ix86} x86_64 ppc alpha
     29ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
    3030BuildRequires:  ghc, ghc-doc, ghc-prof
    31 BuildRequires:  ghc-rpm-macros >= 0.7.0
     31# macros for building haskell packages
     32BuildRequires:  ghc-rpm-macros >= 0.7.3
     33BuildRequires:  hscolour
    3234%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
    3335%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
     
    3537%description
    3638%{common_description}
    37 %if %{with shared}
    38 This package provides the shared library.
    39 %endif
    40 
    41 
    42 %{?ghc_lib_package}
    4339
    4440
     
    5248
    5349%install
    54 rm -rf $RPM_BUILD_ROOT
    5550%ghc_lib_install
    5651
    5752
    58 %clean
    59 rm -rf $RPM_BUILD_ROOT
     53# define the devel and prof subpkgs, devel post[un] scripts, and filelists:
     54# ghc-%pkg_name{,devel,prof}.files
     55%ghc_lib_package
    6056
    6157
    6258%changelog
     59* Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 3001.1.8.2-0
     60- regenerated packaging with cabal2spec-0.22.5
     61
    6362* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.1-0
    6463- initial packaging for Fedora automatically generated by cabal2spec-0.22.1
  • trunk/server/fedora/specs/ghc-unix-handle.spec

    r1693 r2066  
     1# For Haskell Packaging Guidelines see:
     2# - https://fedoraproject.org/wiki/Packaging:Haskell
     3# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
     4
    15%global pkg_name unix-handle
    26
     7# common part of summary for all the subpackages
    38%global common_summary Haskell %{pkg_name} library
    49
     10# main description used for all the subpackages
    511%global common_description A %{pkg_name} library for Haskell.
    612
    7 # add any Haskell library dependencies here:
     13# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
    814#%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel
    915
    10 # add any foreign library dependencies here:
     16# foreign library dependencies (used for buildrequires and devel subpkg requires)
    1117#%%global ghc_pkg_c_deps @CDEP1@-devel
    12 
    13 %bcond_without shared
    14 
    15 # debuginfo is not useful for ghc
    16 %global debug_package %{nil}
    1718
    1819Name:           ghc-%{pkg_name}
     
    2324Group:          System Environment/Libraries
    2425License:        BSD
    25 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
     26URL:            http://hackage.haskell.org/package/%{pkg_name}
    2627Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
    27 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    2828# fedora ghc archs:
    29 ExclusiveArch:  %{ix86} x86_64 ppc alpha
     29ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
    3030BuildRequires:  ghc, ghc-doc, ghc-prof
    31 BuildRequires:  ghc-rpm-macros >= 0.7.0
     31# macros for building haskell packages
     32BuildRequires:  ghc-rpm-macros >= 0.7.3
     33BuildRequires:  hscolour
    3234%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
    3335%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
     
    3537%description
    3638%{common_description}
    37 %if %{with shared}
    38 This package provides the shared library.
    39 %endif
    40 
    41 
    42 %{?ghc_lib_package}
    4339
    4440
     
    5248
    5349%install
    54 rm -rf $RPM_BUILD_ROOT
    5550%ghc_lib_install
    5651
    5752
    58 %clean
    59 rm -rf $RPM_BUILD_ROOT
     53# define the devel and prof subpkgs, devel post[un] scripts, and filelists:
     54# ghc-%pkg_name{,devel,prof}.files
     55%ghc_lib_package
    6056
    6157
    6258%changelog
     59* Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0.0-0
     60- regenerated packaging with cabal2spec-0.22.5
     61
    6362* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0
    6463- initial packaging for Fedora automatically generated by cabal2spec-0.22.1
  • trunk/server/fedora/specs/httpd.spec.patch

    r1738 r2066  
    1 --- httpd.spec.orig     2010-10-27 08:26:15.000000000 -0400
    2 +++ httpd.spec  2010-11-18 18:20:43.000000000 -0500
    3 @@ -7,7 +7,7 @@
     1--- httpd.spec.orig     2011-09-13 09:43:36.000000000 -0400
     2+++ httpd.spec  2011-11-05 20:57:13.910145847 -0400
     3@@ -8,7 +8,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.17
    7 -Release: 1%{?dist}.1
    8 +Release: 1%{?dist}.1.scripts.%{scriptsversion}
     6 Version: 2.2.21
     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.bz2
    1111 Source1: index.html
    12 @@ -55,6 +55,14 @@
    13  Conflicts: pcre < 4.0
    14  Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
     12@@ -54,6 +54,15 @@
     13 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
     14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
    1515 
    16 +Provides: scripts-httpd
     16+Provides: scripts-httpd = %{version}-%{release}
    1717+Patch1000: httpd-suexec-scripts.patch
    1818+Patch1003: httpd-2.2.x-mod_status-security.patch
     
    2121+Patch1006: httpd-suexec-cloexec.patch
    2222+Patch1007: httpd-fixup-vhost.patch
     23+Patch1008: httpd-sysv-deps.patch
    2324+
    2425 %description
    2526 The Apache HTTP Server is a powerful, efficient, and extensible
    2627 web server.
    27 @@ -65,6 +73,7 @@
     28@@ -64,6 +73,7 @@
    2829 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    2930 Requires: apr-devel, apr-util-devel, pkgconfig
    3031 Requires: httpd = %{version}-%{release}
    31 +Provides: scripts-httpd-devel
     32+Provides: scripts-httpd-devel = %{version}-%{release}
    3233 
    3334 %description devel
    3435 The httpd-devel package contains the APXS binary and other files
    35 @@ -103,6 +112,7 @@
    36  Requires(post): openssl >= 0.9.7f-4, /bin/cat
     36@@ -102,6 +112,7 @@
     37 Requires(post): openssl, /bin/cat
    3738 Requires(pre): httpd
    38  Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
     39 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
    3940+Provides: scripts-mod_ssl
    4041 Obsoletes: stronghold-mod_ssl
    4142 
    4243 %description -n mod_ssl
    43 @@ -130,6 +140,13 @@
     44@@ -110,6 +121,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 +144,13 @@
    4457 # Patch in vendor/release string
    4558 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    5568 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    5669 if test "x${vmmn}" != "x%{mmn}"; then
    57 @@ -177,10 +194,12 @@
     70@@ -175,10 +198,12 @@
    5871         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    5972        --enable-suexec --with-suexec \
  • trunk/server/fedora/specs/krb5.spec.patch

    r1819 r2066  
    1 --- krb5.spec.orig      2011-04-13 14:56:35.000000000 -0400
    2 +++ krb5.spec   2011-04-27 02:52:07.000000000 -0400
    3 @@ -10,7 +10,7 @@
     1--- krb5.spec.orig      2011-11-16 12:37:32.246736120 -0500
     2+++ krb5.spec   2011-11-16 12:42:47.134740975 -0500
     3@@ -6,7 +6,7 @@
    44 Summary: The Kerberos network authentication system
    55 Name: krb5
    6  Version: 1.7.1
    7 -Release: 19%{?dist}
    8 +Release: 19%{?dist}.scripts.%{scriptsversion}
     6 Version: 1.9.1
     7-Release: 14%{?dist}
     8+Release: 14%{?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.7/krb5-1.7.1-signed.tar
     10 # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.1-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -98,6 +98,8 @@
    13  Patch109: krb5-1.7.1-paren.patch
    14  Patch110: 2011-004-patch-r18.txt
     12@@ -65,6 +65,8 @@
     13 Patch89: krb5-1.9.1-sendto_poll3.patch
     14 Patch90: krb5-1.9-MITKRB5-SA-2011-006.patch
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
     
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 Group: System Environment/Libraries
    21 @@ -142,6 +144,7 @@
     21@@ -114,6 +116,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 @@ -1696,6 +1699,7 @@
    30  %patch108 -p1 -b .2011-003
    31  %patch109 -p1 -b .paren
    32  %patch110 -p1 -b .2011-004
     29@@ -221,6 +224,7 @@
     30 %patch88 -p1 -b .crossrealm
     31 %patch89 -p1 -b .sendto_poll3
     32 %patch90 -p1 -b .2011-006
    3333+%patch1000 -p1 -b .kuserok
    3434 gzip doc/*.ps
  • trunk/server/fedora/specs/openafs-include-xstat.spec.patch

    r2014 r2066  
    1 --- openafs.spec.orig   2011-10-19 16:05:41.000000000 -0400
    2 +++ openafs.spec        2011-10-19 16:10:06.000000000 -0400
    3 @@ -1115,7 +1115,7 @@
     1--- openafs.spec.orig   2011-11-04 23:50:34.842221577 -0400
     2+++ openafs.spec        2011-11-04 23:52:00.538590290 -0400
     3@@ -1103,7 +1103,7 @@
    44 
    55 # create list of man pages that go in the 'openafs' package
    66 /bin/ls $RPM_BUILD_ROOT%{_mandir}/man1 \
    7 -       |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^rxdebug|scout|^sys|tokens|translate|udebug|unlog|^uss|^vos' \
    8 +       |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^rxdebug|scout|^sys|tokens|translate|^xstat|udebug|unlog|^uss|^vos' \
     7-       |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^restorevol|^rxdebug|scout|^sys|tokens|translate|udebug|unlog|^uss|^vos' \
     8+       |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^restorevol|^rxdebug|scout|^sys|tokens|translate|^xstat|udebug|unlog|^uss|^vos' \
     9        |egrep -v '^afs_compile_et' \
    910        >openafs-man1files
    1011 
    11  /bin/ls $RPM_BUILD_ROOT%{_mandir}/man5 \
    12 @@ -1145,6 +1145,8 @@
     12@@ -1134,6 +1134,8 @@
    1313 %{_bindir}/tokens
    1414 %{_bindir}/tokens.krb
     
    1919 %{_bindir}/unlog
    2020 %{_sbindir}/backup
    21 @@ -1196,7 +1198,7 @@
     21@@ -1184,7 +1186,7 @@
    2222 done
    2323 
     
    2828 done
    2929 
    30 @@ -1208,7 +1210,7 @@
     30@@ -1196,7 +1198,7 @@
    3131 rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump*
    3232 
  • trunk/server/fedora/specs/openafs.spec.patch

    r1693 r2066  
    1 --- openafs.spec.orig   2010-09-10 18:21:53.000000000 -0400
    2 +++ openafs.spec        2010-09-10 18:34:30.000000000 -0400
    3 @@ -8,7 +8,7 @@
    4  # for beta/rc releases make pkgrel 0.X.<tag>
     1--- rpmbuild/SPECS/openafs.spec
     2+++ rpmbuild/SPECS/openafs.spec.~3~     2011-11-20 20:13:52.211673609 -0500
     3@@ -4,7 +4,7 @@
     4 %define pkgvers 1.6.0
     5 # for beta/rc releases make pkgrel 0.<tag>
    56 # for real releases make pkgrel 1 (or more for extra releases)
    6  #%define pkgrel 0.1.rc1
    7 -%define pkgrel 0.pre3
    8 +%define pkgrel 0.pre3.99scripts.%{scriptsversion}
     7-%define pkgrel 1
     8+%define pkgrel 1.99.scripts.%{scriptsversion}
    99 
    10  %if %{?osvers:0}%{!?osvers:1}
    11  %define osvers 1
    12 @@ -261,6 +261,10 @@
    13  %endif
     10 %{!?fedorakmod: %define fedorakmod 1}
     11 %{!?build_dkmspkg: %define build_dkmspkg 1}
     12@@ -237,6 +237,14 @@
     13 
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    1515 
    1616+Patch1000: openafs-scripts.patch
    17 +Patch1003: openafs-localcsdb.patch
    18 +Patch1005: openafs-numsysnames.patch
     17+Patch1001: openafs-localcsdb.patch
     18+Patch1002: openafs-systemd.patch
     19+Patch1003: openafs-systemd-crond.patch
     20+Patch1004: openafs-linux-3.1-rcu.patch
     21+Patch1005: openafs-linux-3.1-fsync.patch
     22+Patch1006: openafs-linux-3.1-zalloc.patch
    1923+
    2024 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    2125 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2226 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    23 @@ -343,6 +347,7 @@
     27@@ -316,6 +324,7 @@
    2428 %if %{build_userspace}
    2529 
     
    2933 
    3034 %if %{fedorakmod}
    31 @@ -403,6 +408,7 @@
     35@@ -376,6 +385,7 @@
    3236 
    3337 %if %{build_authlibs}
     
    3741 Group: Networking/Filesystems
    3842 
    39 @@ -419,6 +425,7 @@
     43@@ -392,6 +402,7 @@
    4044 %endif
    4145 
     
    4347+Provides: scripts-openafs-authlibs-devel
    4448 %if %{build_authlibs}
    45  Requires: openafs-authlibs = %{version}
     49 Requires: openafs-authlibs = %{version}-%{release}
    4650 %endif
    47 @@ -437,6 +444,7 @@
     51@@ -410,6 +421,7 @@
    4852 libraries.
    4953 
     
    5256 Summary: OpenAFS Development Libraries and Headers
    5357 Group: Development/Filesystems
    54  
    55 @@ -465,6 +473,7 @@
     58 Requires: openafs = %{version}-%{release}
     59@@ -439,6 +451,7 @@
    5660 administrators.
    5761 
     
    6165 Group: Networking/Filesystems
    6266 Provides: openafs-kernel = %{version}
    63 @@ -514,6 +523,7 @@
     67@@ -488,6 +501,7 @@
    6468 
    6569 %if %{krb5support}
     
    6973 Requires: openafs = %{version}
    7074 Group: Networking/Filesystems
    71 @@ -540,7 +550,7 @@
     75@@ -514,7 +528,7 @@
    7276 %if %{build_modules}
    7377 
     
    7882 %else
    7983 
    80 @@ -699,6 +709,9 @@
     84@@ -671,6 +685,15 @@
     85 #%setup -q -n %{srcdir}
     86 %setup -q -b 1 -n %{srcdir}
    8187 
    82  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
    83  %patch0 -p1 -b .kmod26
     88+# Apply the Scripts patch
    8489+%patch1000 -p1 -b .scripts
    85 +%patch1003 -p1 -b .localcsdb
    86 +%patch1005 -p1 -b .numsysnames
    87  
     90+%patch1001 -p1 -b .localcsdb
     91+%patch1002 -p1 -b .systemd
     92+%patch1003 -p1 -b .systemd-crond
     93+%patch1004 -p1 -b .rcu
     94+%patch1005 -p1 -b .fsync
     95+%patch1006 -p1 -b .zalloc
     96+
    8897 ##############################################################################
    8998 #
     99 # building
     100@@ -1212,6 +1235,13 @@
     101 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
     102 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
     103 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
     104+%else
     105+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so
     106+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
     107+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
     108+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
     109+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
     110+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
     111 %endif
     112 
     113 %endif
  • trunk/server/fedora/specs/openssh.spec.patch

    r1739 r2066  
    11--- openssh.spec.orig   2010-05-31 06:20:02.000000000 -0400
    22+++ openssh.spec        2010-09-06 21:53:21.000000000 -0400
    3 @@ -74,7 +74,7 @@
     3@@ -78,7 +78,7 @@
    44 Summary: An open source implementation of SSH protocol versions 1 and 2
    55 Name: openssh
    6  Version: 5.4p1
    7 -Release: %{openssh_rel}%{?dist}%{?rescue_rel}
    8 +Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
     6 Version: %{openssh_ver}
     7-Release: %{openssh_rel}%{?dist}%{?rescue_rel}.1
     8+Release: %{openssh_rel}%{?dist}%{?rescue_rel}.1.scripts.%{scriptsversion}
    99 URL: http://www.openssh.com/portable.html
    1010 #URL1: http://pamsshagentauth.sourceforge.net
    1111 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
    12 @@ -88,6 +88,8 @@
     12@@ -92,6 +92,7 @@
    1313 Source3: sshd.init
    1414 Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2
    1515 Source5: pam_ssh_agent-rmheaders
    1616+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
    17 +Patch1002: openssh-no-spurious-correct-key-incorrect-host-messages.patch
    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 +178,7 @@
    22  Requires(post): chkconfig >= 0.9, /sbin/service
     17
     18 Patch100: openssh-5.6p1-wIm.patch
     19 Patch0: openssh-5.6p1-redhat.patch
     20@@ -207,6 +209,7 @@
    2321 Requires(pre): /usr/sbin/useradd
    2422 Requires: pam >= 1.0.1-3
     23 Requires: fipscheck-lib%{_isa} >= 1.3.0
    2524+Provides: scripts-openssh-server
    2625 
    27  %package askpass
    28  Summary: A passphrase dialog for OpenSSH and X
    29 @@ -267,6 +271,9 @@
    30  %patch75 -p1 -b .dso
    31  %patch76 -p1 -b .bz595935
     26 %if %{ldap}
     27 %package ldap
     28@@ -323,6 +326,8 @@
     29 %patch80 -p1 -b .biguid
     30 %patch81 -p1 -b .clientloop
    3231 
    3332+%patch1001 -p1 -b .gssapi-env
    34 +%patch1002 -p1 -b .no-spurious-correct-key-incorrect-host-messages
    3533+
    3634 autoreconf
    37  
    38  %build
     35 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
     36 autoreconf
     37
  • trunk/server/fedora/specs/redland-bindings.spec.patch

    r2001 r2066  
    1 --- redland-bindings.spec       2011-10-12 14:51:58.000000000 -0400
    2 +++ redland-bindings-php.spec   2011-10-13 10:15:24.000000000 -0400
     1--- redland-bindings.spec.old   2011-10-12 14:51:58.000000000 -0400
     2+++ redland-bindings.spec       2011-10-13 10:15:24.000000000 -0400
    33@@ -1,6 +1,6 @@
    44 Name:           redland-bindings
    5  Version:        1.0.7.1
    6 -Release:        1%{?dist}
    7 +Release:        1%{?dist}.scripts.%{scriptsversion}
     5 Version:        1.0.11.1
     6-Release:        6%{?dist}
     7+Release:        6%{?dist}.scripts.%{scriptsversion}
    88 Summary:        Redland RDF Application Framework API Bindings
    99 
  • trunk/server/fedora/specs/scripts-base.spec

    r1815 r2066  
    2121Requires: scripts-openafs-krb5
    2222Requires: scripts-openssh-server
     23Requires: scripts-static-cat
     24Requires: scripts-rubygems
    2325Requires: sql-signup
    2426Requires: tokensys
  • trunk/server/fedora/specs/scripts-static-cat.spec

    r1693 r2066  
    1 # link with shared libs
    2 # andersk: Disabled for 3x faster startup speed.
    3 #%%bcond_without dynamic
    4 
    5 # ghc does not emit debug information
    6 %global debug_package %{nil}
     1# For Haskell Packaging Guidelines see:
     2# - https://fedoraproject.org/wiki/Packaging:Haskell
     3# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
    74
    85Name:           scripts-static-cat
     
    1512URL:            http://scripts.mit.edu/
    1613Source0:        %{name}.tar.gz
    17 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    1814# fedora ghc archs:
    19 ExclusiveArch:  %{ix86} x86_64 ppc alpha
    20 BuildRequires:  ghc
     15ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
     16BuildRequires:  ghc-devel
     17# macros for building haskell packages
    2118BuildRequires:  ghc-rpm-macros >= 0.7.0
    2219BuildRequires:  ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel
     
    3532
    3633%install
    37 rm -rf $RPM_BUILD_ROOT
    3834%ghc_bin_install
    39 
    40 
    41 %clean
    42 rm -rf $RPM_BUILD_ROOT
    4335
    4436
     
    4941
    5042%changelog
     43* Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0-0
     44- regenerated packaging with cabal2spec-0.22.5
     45
    5146* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.0-0
    5247- initial packaging for Fedora automatically generated by cabal2spec-0.22.1
  • trunk/server/fedora/specs/tokensys.spec

    r1594 r2066  
    1010BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
    1111%define debug_package %{nil}
    12 Prereq: /usr/kerberos/bin/kinit, /usr/bin/aklog
     12Prereq: /usr/bin/kinit, /usr/bin/aklog
     13Requires(post): systemd-units
     14Requires(preun): systemd-units
     15Requires(postun): systemd-units
     16BuildRequires: systemd-units
    1317
    1418%description
     
    1721Contains:
    1822 - A shell script for renewing the scripts AFS credentials <renew>
    19  - A crontab for calling the renew script <crontab>
     23 - A shell script for configuring scripts AFS <scripts-afsagent-startup>
     24 - systemd units for running the above
    2025See http://scripts.mit.edu/wiki for more information.
    2126
     
    2429
    2530%build
    26 ./configure --with-kinit=/usr/kerberos/bin/kinit --with-aklog=/usr/bin/aklog
     31./configure --with-kinit=/usr/bin/kinit --with-aklog=/usr/bin/aklog --with-fs=/usr/bin/fs
    2732
    2833%install
    2934[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
    3035install -D renew $RPM_BUILD_ROOT/home/afsagent/renew
    31 install -D crontab $RPM_BUILD_ROOT/etc/cron.d/afsagent
     36install -D scripts-afsagent-startup $RPM_BUILD_ROOT/usr/local/libexec/scripts-afsagent-startup
     37install -D scripts-afsagent-startup.service $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent-startup.service
     38install -D scripts-afsagent.service $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent.service
     39install -D scripts-afsagent.timer $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent.timer
    3240
    3341%clean
     
    3543
    3644%files
    37 %defattr(0600, root, root)
    38 /etc/cron.d/afsagent
     45%defattr(0644,root,root)
     46%{_unitdir}/*.service
     47%{_unitdir}/*.timer
    3948%defattr(0755, afsagent, afsagent)
    4049/home/afsagent/renew
     50/usr/local/libexec/scripts-afsagent-startup
    4151
    4252%pre
     
    4454useradd -u 101 -g 101 afsagent || [ $? -eq 9 ]
    4555
     56%post
     57/bin/systemctl enable scripts-afsagent-startup.service >/dev/null 2>&1 || :
     58/bin/systemctl enable scripts-afsagent.service >/dev/null 2>&1 || :
     59/bin/systemctl enable scripts-afsagent.timer >/dev/null 2>&1 || :
     60
     61if [ $1 -eq 1 ] ; then
     62    # Initial installation
     63    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
     64fi
     65
     66%preun
     67if [ $1 -eq 0 ] ; then
     68    # Package removal, not upgrade
     69    /bin/systemctl --no-reload disable scripts-afsagent-startup.service > /dev/null 2>&1 || :
     70    /bin/systemctl --no-reload disable scripts-afsagent.service > /dev/null 2>&1 || :
     71    /bin/systemctl --no-reload disable scripts-afsagent.timer > /dev/null 2>&1 || :
     72    /bin/systemctl stop scripts-afsagent-startup.service > /dev/null 2>&1 || :
     73    /bin/systemctl stop scripts-afsagent.service > /dev/null 2>&1 || :
     74    /bin/systemctl stop scripts-afsagent.timer > /dev/null 2>&1 || :
     75fi
     76
    4677%postun
     78/bin/systemctl daemon-reload >/dev/null 2>&1 || :
     79if [ $1 -ge 1 ] ; then
     80    # Package upgrade, not uninstall
     81    /bin/systemctl try-restart scripts-afsagent.service >/dev/null 2>&1 || :
     82fi
     83
    4784if [ "$1" = "0" ] ; then
    4885   userdel -r afsagent
     
    5087
    5188%changelog
     89* Mon Nov 21 2011  Quentin Smith <quentin@mit.edu>
     90- add systemd units
     91- remove crontab
     92
    5293* Tue Aug 17 2010  Geoffrey Thomas <geofft@mit.edu>
    5394- aklog csail as well
  • trunk/server/fedora/specs/whoisd.spec

    r927 r2066  
    1 Summary:        whoisd for <scripts.mit.edu> (virtualhost aware)
    2 Group:                  Applications/System
    3 Name:           whoisd
    4 Version:        0.%{scriptsversion}
    5 Release:        0
    6 Vendor:                 The scripts.mit.edu Team (scripts@mit.edu)
    7 URL:                    http://scripts.mit.edu
    8 License:        GPL
    9 Source0:        %{name}.tar.gz
    10 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
     1Summary:   whoisd for <scripts.mit.edu> (virtualhost aware)
     2Group:     Applications/System
     3Name:      whoisd
     4Version:   0.%{scriptsversion}
     5Release:   1
     6Vendor:    The scripts.mit.edu Team (scripts@mit.edu)
     7URL:       http://scripts.mit.edu
     8License:   GPL
     9Source0:   %{name}.tar.gz
     10
    1111%define debug_package %{nil}
    1212
    13 #BuildRequires:  make
    14 Requires:       python-twisted-core
     13Requires:      python-twisted-core
     14BuildRequires: systemd-units
     15
     16Requires(post):   systemd-units
     17Requires(preun):  systemd-units
     18Requires(postun): systemd-units
     19Requires(post):   systemd-sysv
    1520
    1621%description
     
    2429
    2530%install
    26 [ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
    2731make install DESTDIR=$RPM_BUILD_ROOT exec_prefix=/usr/local
    2832
    29 %clean
    30 [ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
     33%post
     34if [ $1 -eq 1 ] ; then
     35    # Initial installation
     36    /bin/systemctl enable scripts-whoisd.service >/dev/null 2>&1 || :
     37fi
     38
     39%preun
     40if [ $1 -eq 0 ]; then
     41    /bin/systemctl --no-reload disable scripts-whoisd.service >/dev/null 2>&1 || :
     42    /bin/systemctl stop scripts-whoisd.service > /dev/null 2>&1 || :
     43fi
     44
     45%postun
     46/bin/systemctl daemon-reload >/dev/null 2>&1 || :
     47if [ $1 -ge 1 ]; then
     48    /bin/systemctl try-restart scripts-whoisd.service >/dev/null 2>&1 || :
     49fi
    3150
    3251%files
    3352%defattr(0644,root,root,-)
    3453/usr/local/libexec/whoisd.tac
    35 %defattr(0600,root,root)
    36 /etc/cron.d/whoisd
     54%defattr(0644,root,root)
     55/lib/systemd/system/scripts-whoisd.service
    3756
    3857%changelog
     58* Thu Aug 25 2011 Alexander Chernyakhovsky <achernya@mit.edu> 0-1
     59- package systemd service file
    3960
    4061* Tue Jun 03 2008 Joe Presbrey <presbrey@mit.edu> 0.00
  • trunk/server/fedora/specs/zephyr.spec

    r1693 r2066  
    11Name:           zephyr
    2 Version:        3.0
     2Version:        3.0.1
    33Release:        0.%{scriptsversion}%{?dist}
    44Summary:        Client programs for the Zephyr real-time messaging system
     
    7171make %{?_smp_mflags}
    7272
    73 
    7473%install
    7574rm -rf $RPM_BUILD_ROOT
     
    8079install -m755 zhm.init \
    8180        $RPM_BUILD_ROOT%{_initddir}/zhm
    82 
     81# Make RPM's Provide: searcher actually search the .so files! A recent
     82# change in how RPM detects Provides automatically means that only
     83# files that are executable get searched. Without this hack, all of
     84# the zephyr client tools are Requires: libzephyr.so.4 which is never
     85# Provides:, leading to uninstallable RPMS. This can be removed when
     86# zephyr starts installing the libraries with mode 755 rather than
     87# 644. (Zephyr #79)
     88chmod a+x $RPM_BUILD_ROOT%{_libdir}/libzephyr.so.*
    8389
    8490%post
     
    139145
    140146%changelog
     147* Sat Apr 16 2011 Alexander Chernyakhovsky <achernya@mit.edu> 3.0.1-0
     148- Zephyr 3.0.1
     149
    141150* Sun Sep 19 2010 Anders Kaseorg <andersk@mit.edu> - 3.0-0
    142151- Decrease version below a hypothetical Fedora package.
Note: See TracChangeset for help on using the changeset viewer.