Index: trunk/server/fedora/Makefile =================================================================== --- trunk/server/fedora/Makefile (revision 2053) +++ trunk/server/fedora/Makefile (revision 2066) @@ -19,8 +19,8 @@ # See /COPYRIGHT in this repository for more information. -upstream_yum = krb5 krb5.i686 httpd openssh curl redland-bindings -hackage = MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0 +upstream_yum = krb5 krb5.i686 httpd openssh redland-bindings rubygems +hackage = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle -upstream = openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker zephyr zephyr.i686 python-zephyr athena-aclocal discuss +upstream = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr athena-aclocal discuss oursrc = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat allsrc = $(upstream) $(oursrc) @@ -40,10 +40,6 @@ server_url = "http://web.mit.edu/scripts/src" server_arch = "fedora.stable" -#openafs_url = "http://dl.openafs.org/dl/openafs/1.4.12/openafs-1.4.12-1.1.2.src.rpm" -openafs_url = "http://web.mit.edu/~scripts/yum-repos/rpm-fc13/openafs-1.4.12.1-1.0.pre3.src.rpm" -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" -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" -pacemaker_url = "http://kojipkgs.fedoraproject.org/packages/pacemaker/1.0.5/5.fc12/src/pacemaker-1.0.5-5.fc12.src.rpm" -zephyr_url = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.tar.gz" +openafs_url = "http://dl.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-1.src.rpm" +zephyr_url = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.1.tar.gz" PKG = $(patsubst %.i686,%,$@) @@ -74,12 +70,6 @@ cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum) wget -P $(dload) $(openafs_url) - wget -P $(dload) $(clusterglue_url) - wget -P $(dload) $(heartbeat_url) - wget -P $(dload) $(pacemaker_url) wget -P $(dload) $(zephyr_url) cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/ - cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/ - cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/ - cp $(oursrcdir)/discuss/* $(tmp_src) cabal update cabal fetch $(hackage) @@ -88,4 +78,7 @@ touch download_stamp + cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/ + cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/ + cp $(oursrcdir)/discuss/* $(tmp_src) %.src.rpm: wget -q -nv -N -B $(server_url) -nd -nH -P $(dload) $(server_url)/$*.src.rpm @@ -101,9 +94,12 @@ cp ${specs}/*.spec $(tmp_specs) +# Remove old .orig files so we're not mislead patch-specs: install-srpms @cd ${tmp_specs}; \ list=`ls ${specs}/*.spec.patch`; \ + rm -f *.orig; \ + rm -f *.spec.~*~; \ for i in $$list; do \ - patch < $$i; \ + patch -bV numbered < $$i; \ done; \ list2=`svn ls ${oursrcdir}`; \ @@ -150,10 +146,10 @@ PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \ rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec - /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` + /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` $(filter-out %.i686,$(oursrc)): %: setup PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \ rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec - /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` + /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` $(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')' @@ -161,14 +157,14 @@ $(filter %.i686,$(upstream)): %.i686: setup patch-specs rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec - /usr/bin/mock -r scripts-fc13-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` + /usr/bin/mock -r scripts-fc15-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` $(filter-out %.i686,$(upstream)): %: setup patch-specs rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec - /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` + /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` openafs-kernel: setup PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \ rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec - /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1` + /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1` #sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong @@ -188,18 +184,4 @@ fi -# The following packages are needed for our packages -basic-deps = kernel-devel rpm-build rpmdevtools mock gcc autoconf patch krb5-workstation glibc-devel.i686 glibc-devel libtool libgcc.i686 -oursrc-deps = hesinfo openldap-clients openldap-devel.i686 php-devel -httpdmods-deps = httpd-devel -httpd-deps = xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel -krb5-deps = bison ncurses-devel texinfo keyutils-libs-devel texinfo-tex texlive-latex libss-devel rsh -openafs-deps = pam-devel automake -moira-deps = e2fsprogs-devel -zephyr-deps = hesiod-devel libss-devel krb5-devel readline-devel -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 -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 -haskell-deps = cabal-install -install-deps: - 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) # XXX: We need to figure out what's going on with compat-readline43 # rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm @@ -207,5 +189,4 @@ fedora: - make install-deps make upstream rpm -ivh $(out_rpms)/`uname -m`/openafs-devel*.rpm Index: trunk/server/fedora/config/etc/cron.d/check-filecaps =================================================================== --- trunk/server/fedora/config/etc/cron.d/check-filecaps (revision 2066) +++ trunk/server/fedora/config/etc/cron.d/check-filecaps (revision 2066) @@ -0,0 +1,2 @@ +MAILTO=scripts-root@mit.edu +27 5 * * * root find / -xdev -not -perm -o=x -prune -o -type f -print0 | xargs -0r /usr/sbin/getcap | cut -d' ' -f1 | grep -Fxvf /etc/scripts/allowed-filecaps.list | sed 's/^/Extra file_caps binary: /' Index: trunk/server/fedora/config/etc/cron.d/slapdagent =================================================================== --- trunk/server/fedora/config/etc/cron.d/slapdagent (revision 2053) +++ trunk/server/fedora/config/etc/cron.d/slapdagent (revision 2066) @@ -1,3 +1,3 @@ KRB5CCNAME=/var/run/dirsrv/krb5cc MAILTO=scripts-root@mit.edu -0 */3 * * * fedora-ds /usr/kerberos/bin/kinit -k -t /etc/dirsrv/keytab ldap/$(hostname) +0 */3 * * * fedora-ds /usr/bin/kinit -k -t /etc/dirsrv/keytab ldap/$(hostname) Index: trunk/server/fedora/config/etc/cron.d/whoisd =================================================================== --- trunk/server/fedora/config/etc/cron.d/whoisd (revision 2053) +++ (revision ) @@ -1,1 +1,0 @@ -@reboot root /usr/bin/twistd -l /var/log/scripts-whoisd.log --pidfile /var/run/whoisd.pid -y /usr/local/libexec/whoisd.tac Index: trunk/server/fedora/config/etc/hosts =================================================================== --- trunk/server/fedora/config/etc/hosts (revision 2053) +++ trunk/server/fedora/config/etc/hosts (revision 2066) @@ -18,5 +18,6 @@ 18.181.0.234 busy-beaver.mit.edu busy-beaver scripts7.mit.edu scripts7 18.181.0.235 real-mccoy.mit.edu real-mccoy scripts8.mit.edu scripts8 -18.181.0.135 shining-armor.mit.edu shining-armor # scripts9.mit.edu scripts9 +18.181.0.135 shining-armor.mit.edu shining-armor scripts9.mit.edu scripts9 +18.181.0.141 golden-egg.mit.edu golden-egg scripts10.mit.edu scripts10 172.21.0.57 better-mousetrap.mit.edu @@ -29,2 +30,3 @@ 172.21.0.235 real-mccoy.mit.edu 172.21.0.135 shining-armor.mit.edu +172.21.0.141 golden-egg.mit.edu Index: trunk/server/fedora/config/etc/httpd/conf.d/scripts-special.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/conf.d/scripts-special.conf (revision 2053) +++ trunk/server/fedora/config/etc/httpd/conf.d/scripts-special.conf (revision 2066) @@ -1,4 +1,4 @@ Alias /__scripts/heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat -Alias /__scripts/django/media /usr/lib/python2.6/site-packages/django/contrib/admin/media +Alias /__scripts/django/media /usr/lib/python2.7/site-packages/django/contrib/admin/media Alias /__scripts /afs/athena.mit.edu/contrib/scripts/www @@ -9,5 +9,5 @@ - + SetHandler none Index: trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf (revision 2053) +++ trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf (revision 2066) @@ -1,2 +1,16 @@ ServerName scripts.mit.edu -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 +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 \ + golden-egg.mit.edu golden-egg g-e.mit.edu g-e scripts10.mit.edu scripts10 18.181.0.141 \ + localhost 127.0.0.1 ::1 Index: trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost.conf (revision 2053) +++ trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost.conf (revision 2066) @@ -1,4 +1,5 @@ DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home SuExecUserGroup scripts users +UserDir enabled UserDir web_scripts # Comment the following line out to take the machine out of the LVS pool Index: trunk/server/fedora/config/etc/krb.conf =================================================================== --- trunk/server/fedora/config/etc/krb.conf (revision 2053) +++ (revision ) @@ -1,5 +1,0 @@ -ATHENA.MIT.EDU -ATHENA.MIT.EDU KERBEROS.MIT.EDU admin server -ATHENA.MIT.EDU KERBEROS-1.MIT.EDU -ATHENA.MIT.EDU KERBEROS-2.MIT.EDU -ATHENA.MIT.EDU KERBEROS-3.MIT.EDU Index: trunk/server/fedora/config/etc/krb.realms =================================================================== --- trunk/server/fedora/config/etc/krb.realms (revision 2053) +++ (revision ) @@ -1,54 +1,0 @@ -sics.se SICS.SE -.sics.se SICS.SE -nada.kth.se NADA.KTH.SE -pdc.kth.se NADA.KTH.SE -.hydro.kth.se NADA.KTH.SE -.mech.kth.se MECH.KTH.SE -.nada.kth.se NADA.KTH.SE -.pdc.kth.se NADA.KTH.SE -.sans.kth.se NADA.KTH.SE -.admin.kth.se ADMIN.KTH.SE -.e.kth.se E.KTH.SE -.s3.kth.se E.KTH.SE -.radio.kth.se E.KTH.SE -.ttt.kth.se E.KTH.SE -.electrum.kth.se IT.KTH.SE -.math.kth.se MATH.KTH.SE -.it.kth.se IT.KTH.SE -.sth.sunet.se SUNET.SE -.pilsnet.sunet.se SUNET.SE -.sunet.se SUNET.SE -.ml.kva.se ML.KVA.SE -pi.se PI.SE -.pi.se PI.SE -.adm.pi.se PI.SE -.stacken.kth.se STACKEN.KTH.SE -kth.se KTH.SE -.kth.se KTH.SE -.bion.kth.se BION.KTH.SE -.lib.kth.se LIB.KTH.SE -.dsv.su.se DSV.SU.SE -.MIT.EDU ATHENA.MIT.EDU -.MIT.EDU. ATHENA.MIT.EDU -MIT.EDU ATHENA.MIT.EDU -DODO.MIT.EDU SMS_TEST.MIT.EDU -.UCSC.EDU CATS.UCSC.EDU -.UCSC.EDU. CATS.UCSC.EDU -CYGNUS.COM CYGNUS.COM -.CYGNUS.COM CYGNUS.COM -MIRKWOOD.CYGNUS.COM MIRKWOOD.CYGNUS.COM -KITHRUP.COM KITHRUP.COM -.KITHRUP.COM KITHRUP.COM -.berkeley.edu EECS.BERKELEY.EDU -.CS.berkeley.edu EECS.BERKELEY.EDU -.MIT.EDU ATHENA.MIT.EDU -.mit.edu ATHENA.MIT.EDU -.BSDI.COM BSDI.COM -ARMADILLO.COM ARMADILLO.COM -.ARMADILLO.COM ARMADILLO.COM -ZEN.ORG ZEN.ORG -.ZEN.ORG ZEN.ORG -toad.com TOAD.COM -.toad.com TOAD.COM -lloyd.com LLOYD.COM -.lloyd.com LLOYD.COM Index: trunk/server/fedora/config/etc/krb5.conf =================================================================== --- trunk/server/fedora/config/etc/krb5.conf (revision 2053) +++ trunk/server/fedora/config/etc/krb5.conf (revision 2066) @@ -1,3 +1,4 @@ [libdefaults] + allow_weak_crypto = true default_realm = ATHENA.MIT.EDU # The following krb5.conf variables are only for MIT Kerberos. Index: trunk/server/fedora/config/etc/ldap.conf =================================================================== --- trunk/server/fedora/config/etc/ldap.conf (revision 2053) +++ (revision ) @@ -1,296 +1,0 @@ -# @(#)$Id: ldap.conf,v 1.38 2006/05/15 08:13:31 lukeh Exp $ -# -# This is the configuration file for the LDAP nameservice -# switch library and the LDAP PAM module. -# -# The man pages for this file are nss_ldap(5) and pam_ldap(5) -# -# PADL Software -# http://www.padl.com -# - -# Your LDAP server. Must be resolvable without using LDAP. -# Multiple hosts may be specified, each separated by a -# space. How long nss_ldap takes to failover depends on -# whether your LDAP client library supports configurable -# network or connect timeouts (see bind_timelimit). -#host 127.0.0.1 - -# The distinguished name of the search base. -base dc=scripts,dc=mit,dc=edu - -# Another way to specify your LDAP server is to provide an -# uri with the server name. This allows to use -# Unix Domain Sockets to connect to a local LDAP Server. -#uri ldap://127.0.0.1/ -#uri ldaps://127.0.0.1/ -#uri ldapi://%2fvar%2frun%2fldapi_sock/ -# Note: %2f encodes the '/' used as directory separator -uri ldapi://%2fvar%2frun%2fslapd-scripts.socket/ - -# The LDAP version to use (defaults to 3 -# if supported by client library) -#ldap_version 3 - -# The distinguished name to bind to the server with. -# Optional: default is to bind anonymously. -#binddn cn=proxyuser,dc=example,dc=com - -# The credentials to bind with. -# Optional: default is no credential. -#bindpw secret - -# The distinguished name to bind to the server with -# if the effective user ID is root. Password is -# stored in /etc/ldap.secret (mode 600) -#rootbinddn cn=manager,dc=example,dc=com - -# The port. -# Optional: default is 389. -#port 389 - -# The search scope. -#scope sub -#scope one -#scope base - -# Search timelimit -#timelimit 30 -timelimit 120 - -# Bind/connect timelimit -#bind_timelimit 30 -bind_timelimit 120 - -# Reconnect policy: hard (default) will retry connecting to -# the software with exponential backoff, soft will fail -# immediately. -#bind_policy hard - -# Idle timelimit; client will close connections -# (nss_ldap only) if the server has not been contacted -# for the number of seconds specified below. -#idle_timelimit 3600 -idle_timelimit 3600 - -# Filter to AND with uid=%s -#pam_filter objectclass=account - -# The user ID attribute (defaults to uid) -#pam_login_attribute uid - -# Search the root DSE for the password policy (works -# with Netscape Directory Server) -#pam_lookup_policy yes - -# Check the 'host' attribute for access control -# Default is no; if set to yes, and user has no -# value for the host attribute, and pam_ldap is -# configured for account management (authorization) -# then the user will not be allowed to login. -#pam_check_host_attr yes - -# Check the 'authorizedService' attribute for access -# control -# Default is no; if set to yes, and the user has no -# value for the authorizedService attribute, and -# pam_ldap is configured for account management -# (authorization) then the user will not be allowed -# to login. -#pam_check_service_attr yes - -# Group to enforce membership of -#pam_groupdn cn=PAM,ou=Groups,dc=example,dc=com - -# Group member attribute -#pam_member_attribute uniquemember - -# Specify a minium or maximum UID number allowed -#pam_min_uid 0 -#pam_max_uid 0 - -# Template login attribute, default template user -# (can be overriden by value of former attribute -# in user's entry) -#pam_login_attribute userPrincipalName -#pam_template_login_attribute uid -#pam_template_login nobody - -# HEADS UP: the pam_crypt, pam_nds_passwd, -# and pam_ad_passwd options are no -# longer supported. -# -# Do not hash the password at all; presume -# the directory server will do it, if -# necessary. This is the default. -#pam_password clear - -# Hash password locally; required for University of -# Michigan LDAP server, and works with Netscape -# Directory Server if you're using the UNIX-Crypt -# hash mechanism and not using the NT Synchronization -# service. -#pam_password crypt - -# Remove old password first, then update in -# cleartext. Necessary for use with Novell -# Directory Services (NDS) -#pam_password clear_remove_old -#pam_password nds - -# RACF is an alias for the above. For use with -# IBM RACF -#pam_password racf - -# Update Active Directory password, by -# creating Unicode password and updating -# unicodePwd attribute. -#pam_password ad - -# Use the OpenLDAP password change -# extended operation to update the password. -#pam_password exop - -# Redirect users to a URL or somesuch on password -# changes. -#pam_password_prohibit_message Please visit http://internal to change your password. - -# RFC2307bis naming contexts -# Syntax: -# nss_base_XXX base?scope?filter -# where scope is {base,one,sub} -# and filter is a filter to be &'d with the -# default filter. -# You can omit the suffix eg: -# nss_base_passwd ou=People, -# to append the default base DN but this -# may incur a small performance impact. -nss_base_passwd ou=People,dc=scripts,dc=mit,dc=edu?one -#nss_base_shadow ou=People,dc=example,dc=com?one -nss_base_group ou=Groups,dc=scripts,dc=mit,dc=edu?one -#nss_base_hosts ou=Hosts,dc=example,dc=com?one -#nss_base_services ou=Services,dc=example,dc=com?one -#nss_base_networks ou=Networks,dc=example,dc=com?one -#nss_base_protocols ou=Protocols,dc=example,dc=com?one -#nss_base_rpc ou=Rpc,dc=example,dc=com?one -#nss_base_ethers ou=Ethers,dc=example,dc=com?one -#nss_base_netmasks ou=Networks,dc=example,dc=com?ne -#nss_base_bootparams ou=Ethers,dc=example,dc=com?one -#nss_base_aliases ou=Aliases,dc=example,dc=com?one -#nss_base_netgroup ou=Netgroup,dc=example,dc=com?one - -# Just assume that there are no supplemental groups for these named users -nss_initgroups_ignoreusers root,ldap,named,avahi,haldaemon,dbus,radvd,tomcat,radiusd,news,mailman,nscd - -# attribute/objectclass mapping -# Syntax: -#nss_map_attribute rfc2307attribute mapped_attribute -#nss_map_objectclass rfc2307objectclass mapped_objectclass - -# configure --enable-nds is no longer supported. -# NDS mappings -#nss_map_attribute uniqueMember member - -# Services for UNIX 3.5 mappings -#nss_map_objectclass posixAccount User -#nss_map_objectclass shadowAccount User -#nss_map_attribute uid msSFU30Name -#nss_map_attribute uniqueMember msSFU30PosixMember -#nss_map_attribute userPassword msSFU30Password -#nss_map_attribute homeDirectory msSFU30HomeDirectory -#nss_map_attribute homeDirectory msSFUHomeDirectory -#nss_map_objectclass posixGroup Group -#pam_login_attribute msSFU30Name -#pam_filter objectclass=User -#pam_password ad - -# configure --enable-mssfu-schema is no longer supported. -# Services for UNIX 2.0 mappings -#nss_map_objectclass posixAccount User -#nss_map_objectclass shadowAccount user -#nss_map_attribute uid msSFUName -#nss_map_attribute uniqueMember posixMember -#nss_map_attribute userPassword msSFUPassword -#nss_map_attribute homeDirectory msSFUHomeDirectory -#nss_map_attribute shadowLastChange pwdLastSet -#nss_map_objectclass posixGroup Group -#nss_map_attribute cn msSFUName -#pam_login_attribute msSFUName -#pam_filter objectclass=User -#pam_password ad - -# RFC 2307 (AD) mappings -#nss_map_objectclass posixAccount user -#nss_map_objectclass shadowAccount user -#nss_map_attribute uid sAMAccountName -#nss_map_attribute homeDirectory unixHomeDirectory -#nss_map_attribute shadowLastChange pwdLastSet -#nss_map_objectclass posixGroup group -#nss_map_attribute uniqueMember member -#pam_login_attribute sAMAccountName -#pam_filter objectclass=User -#pam_password ad - -# configure --enable-authpassword is no longer supported -# AuthPassword mappings -#nss_map_attribute userPassword authPassword - -# AIX SecureWay mappings -#nss_map_objectclass posixAccount aixAccount -#nss_base_passwd ou=aixaccount,?one -#nss_map_attribute uid userName -#nss_map_attribute gidNumber gid -#nss_map_attribute uidNumber uid -#nss_map_attribute userPassword passwordChar -#nss_map_objectclass posixGroup aixAccessGroup -#nss_base_group ou=aixgroup,?one -#nss_map_attribute cn groupName -#nss_map_attribute uniqueMember member -#pam_login_attribute userName -#pam_filter objectclass=aixAccount -#pam_password clear - -# Netscape SDK LDAPS -#ssl on - -# Netscape SDK SSL options -#sslpath /etc/ssl/certs - -# OpenLDAP SSL mechanism -# start_tls mechanism uses the normal LDAP port, LDAPS typically 636 -#ssl start_tls -#ssl on - -# OpenLDAP SSL options -# Require and verify server certificate (yes/no) -# Default is to use libldap's default behavior, which can be configured in -# /etc/openldap/ldap.conf using the TLS_REQCERT setting. The default for -# OpenLDAP 2.0 and earlier is "no", for 2.1 and later is "yes". -#tls_checkpeer yes - -# CA certificates for server certificate verification -# At least one of these are required if tls_checkpeer is "yes" -#tls_cacertfile /etc/ssl/ca.cert -#tls_cacertdir /etc/ssl/certs - -# Seed the PRNG if /dev/urandom is not provided -#tls_randfile /var/run/egd-pool - -# SSL cipher suite -# See man ciphers for syntax -#tls_ciphers TLSv1 - -# Client certificate and key -# Use these, if your server requires client authentication. -#tls_cert -#tls_key - -# Disable SASL security layers. This is needed for AD. -#sasl_secprops maxssf=0 - -# Override the default Kerberos ticket cache location. -#krb5_ccname FILE:/etc/.ldapcache - -# SASL mechanism for PAM authentication - use is experimental -# at present and does not support password policy control -#pam_sasl_mech DIGEST-MD5 Index: trunk/server/fedora/config/etc/mock/scripts-fc15-i386.cfg =================================================================== --- trunk/server/fedora/config/etc/mock/scripts-fc15-i386.cfg (revision 2066) +++ trunk/server/fedora/config/etc/mock/scripts-fc15-i386.cfg (revision 2066) @@ -0,0 +1,44 @@ +config_opts['root'] = 'fedora-15-i386' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc15' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-15&arch=i386 +failovermethod=priority + +[updates-released] +name=updates +#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=i386 +baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/15/i386/ +failovermethod=priority + +[local] +name=local +baseurl=file:///home/scripts-build/mock-local/ +cost=2000 +enabled=1 + +[scripts] +name=Scripts +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15/ +enabled=0 +gpgcheck=0 +""" Index: trunk/server/fedora/config/etc/mock/scripts-fc15-x86_64.cfg =================================================================== --- trunk/server/fedora/config/etc/mock/scripts-fc15-x86_64.cfg (revision 2066) +++ trunk/server/fedora/config/etc/mock/scripts-fc15-x86_64.cfg (revision 2066) @@ -0,0 +1,48 @@ +config_opts['root'] = 'fedora-15-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64') +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc15' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all +# .i?86 packages except these. +#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86 +# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-15&arch=x86_64 +failovermethod=priority + +[updates-released] +name=updates +#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=x86_64 +baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/15/x86_64/ +failovermethod=priority + +[local] +name=local +baseurl=file:///home/scripts-build/mock-local/ +cost=2000 +enabled=1 + +[scripts] +name=Scripts +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15/ +enabled=0 +gpgcheck=0 +""" Index: trunk/server/fedora/config/etc/php.d/_scripts.ini =================================================================== --- trunk/server/fedora/config/etc/php.d/_scripts.ini (revision 2053) +++ trunk/server/fedora/config/etc/php.d/_scripts.ini (revision 2066) @@ -3,2 +3,3 @@ cgi.force_redirect = 0 memory_limit = 1024M +date.timezone = America/New_York Index: trunk/server/fedora/config/etc/php.d/tidy.ini =================================================================== --- trunk/server/fedora/config/etc/php.d/tidy.ini (revision 2053) +++ trunk/server/fedora/config/etc/php.d/tidy.ini (revision 2066) @@ -1,1 +1,0 @@ - Index: trunk/server/fedora/config/etc/postfix/main.cf =================================================================== --- trunk/server/fedora/config/etc/postfix/main.cf (revision 2053) +++ trunk/server/fedora/config/etc/postfix/main.cf (revision 2066) @@ -17,6 +17,6 @@ recipient_delimiter = + inet_interfaces = all -readme_directory = /usr/share/doc/postfix-2.7.4/README_FILES -sample_directory = /usr/share/doc/postfix-2.7.4/samples +readme_directory = /usr/share/doc/postfix-2.8.5/README_FILES +sample_directory = /usr/share/doc/postfix-2.8.5/samples sendmail_path = /usr/sbin/sendmail html_directory = no Index: trunk/server/fedora/config/etc/rc.d/rc.local =================================================================== --- trunk/server/fedora/config/etc/rc.d/rc.local (revision 2053) +++ trunk/server/fedora/config/etc/rc.d/rc.local (revision 2066) @@ -3,7 +3,3 @@ touch /var/lock/subsys/local -if [ -r "/afs/athena.mit.edu" ]; then - /sbin/service postfix start -fi - /bin/mkdir -pm 1773 /tmp/sessions Index: trunk/server/fedora/config/etc/scripts/allowed-filecaps.list =================================================================== --- trunk/server/fedora/config/etc/scripts/allowed-filecaps.list (revision 2066) +++ trunk/server/fedora/config/etc/scripts/allowed-filecaps.list (revision 2066) @@ -0,0 +1,2 @@ +/bin/ping +/bin/ping6 Index: trunk/server/fedora/config/etc/scripts/allowed-setugid.list =================================================================== --- trunk/server/fedora/config/etc/scripts/allowed-setugid.list (revision 2053) +++ trunk/server/fedora/config/etc/scripts/allowed-setugid.list (revision 2066) @@ -1,4 +1,2 @@ -/bin/ping -/bin/ping6 /sbin/pam_timestamp_check /sbin/unix_chkpwd Index: trunk/server/fedora/config/etc/ssh/shosts.equiv =================================================================== --- trunk/server/fedora/config/etc/ssh/shosts.equiv (revision 2053) +++ trunk/server/fedora/config/etc/ssh/shosts.equiv (revision 2066) @@ -8,4 +8,5 @@ shining-armor.mit.edu whole-enchilada.mit.edu +golden-egg.mit.edu 172.21.0.53 172.21.0.57 @@ -17,2 +18,3 @@ 172.21.0.135 172.21.0.236 +172.21.0.141 Index: trunk/server/fedora/config/etc/ssh/ssh_known_hosts =================================================================== --- trunk/server/fedora/config/etc/ssh/ssh_known_hosts (revision 2053) +++ trunk/server/fedora/config/etc/ssh/ssh_known_hosts (revision 2066) @@ -8,2 +8,3 @@ whole-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== shining-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== +golden-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== Index: trunk/server/fedora/config/etc/ssh/sshd_config =================================================================== --- trunk/server/fedora/config/etc/ssh/sshd_config (revision 2053) +++ trunk/server/fedora/config/etc/ssh/sshd_config (revision 2066) @@ -20,3 +20,3 @@ IgnoreRhosts yes IgnoreUserKnownHosts yes -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 +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 root@golden-egg.mit.edu Index: trunk/server/fedora/config/etc/sysconfig/dirsrv =================================================================== --- trunk/server/fedora/config/etc/sysconfig/dirsrv (revision 2053) +++ trunk/server/fedora/config/etc/sysconfig/dirsrv (revision 2066) @@ -32,5 +32,5 @@ # slapdagent cronjob) -- geofft 30 October 2010 KRB5CCNAME=/var/run/dirsrv/krb5cc; export KRB5CCNAME -/usr/kerberos/bin/kinit -k -t "$KRB5_KTNAME" ldap/"$(hostname)" +/usr/bin/kinit -k -t "$KRB5_KTNAME" ldap/"$(hostname)" chown --reference="$KRB5_KTNAME" "$KRB5CCNAME" Index: trunk/server/fedora/config/etc/sysconfig/httpd =================================================================== --- trunk/server/fedora/config/etc/sysconfig/httpd (revision 2053) +++ trunk/server/fedora/config/etc/sysconfig/httpd (revision 2066) @@ -21,2 +21,10 @@ # #HTTPD_LANG=C + +# +# When stopping the server a 10 second timeout is allowed before +# forcibly terminating the parent process (with a SIGKILL signal). +# To allow a longer delay, set the STOP_TIMEOUT variable. +# +#STOP_TIMEOUT=10 +# Index: trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1 =================================================================== --- trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1 (revision 2053) +++ trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1 (revision 2066) @@ -12,2 +12,3 @@ 18.181.0.235 via 172.21.0.235 18.181.0.135 via 172.21.0.135 +18.181.0.141 via 172.21.0.141 Index: trunk/server/fedora/config/etc/sysconfig/openafs =================================================================== --- trunk/server/fedora/config/etc/sysconfig/openafs (revision 2053) +++ trunk/server/fedora/config/etc/sysconfig/openafs (revision 2066) @@ -1,21 +1,2 @@ AFSD_ARGS="-afsdb -dynroot -fakestat-all -stat 25000 -daemons 100 -volumes 4000 -files 400000 -chunksize 19" BOSSERVER_ARGS= - -postinit () { - /sbin/sysctl -q afs.GCPAGs=0 - /usr/bin/fs setcrypt on - case "$(lsb_release -cs)" in - Moonshine) - /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' ;; - Sulphur) - /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' ;; - Leonidas) - /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' ;; - Goddard) - /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' ;; - *) - echo "Warning: unknown platform. AFS sysname not set." - esac - /usr/bin/fs setcell -nosuid -c athena -} -AFS_POST_INIT=postinit Index: trunk/server/fedora/config/etc/sysconfig/sysstat =================================================================== --- trunk/server/fedora/config/etc/sysconfig/sysstat (revision 2053) +++ trunk/server/fedora/config/etc/sysconfig/sysstat (revision 2066) @@ -1,2 +1,13 @@ -# How long to keep log files (days), maximum is a month +# sysstat-9.0.6.1 configuration file. + +# How long to keep log files (in days). +# If value is greater than 28, then log files are kept in +# multiple directories, one for each month. HISTORY=30 + +# Compress (using gzip or bzip2) sa and sar files older than (in days): +COMPRESSAFTER=10 + +# Parameters for system activity collector (see sadc man-page) which +# are used for the generation of log files +SADC_OPTIONS="-S DISK" Index: trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl =================================================================== --- trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl (revision 2053) +++ trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl (revision 2066) @@ -32,5 +32,5 @@ sub buildKeyMap($) { my ($file) = @_; - open (KEYS, $file) or warn "Couldn't open $file: $!"; + open (KEYS, $file) or (warn "Couldn't open $file: $!\n" and return); while () { chomp; @@ -58,6 +58,8 @@ buildKeyMap("/root/.ssh/authorized_keys2"); -while (1) { - my @message = scalar(<>); +my @message; + +while (my $line = <>) { + @message = $line; eval { local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required @@ -80,6 +82,6 @@ } elsif ($message =~ m|Root (\S+) shell|) { sendmsg($message); - } elsif ($message =~ m|session \S+ for user (\S+)|) { - sendmsg($message) if exists $USERS{$1}; + } elsif ($message =~ m|pam_unix\(([^:]+):session\): session \S+ for user (\S+)|) { + sendmsg($message) if $1 ne "cron" and exists $USERS{$2}; } elsif ($message =~ m|^Found matching (\w+) key: (\S+)|) { if ($sshkeys{$2}) { @@ -117,4 +119,5 @@ } elsif ($message =~ m|^ *root : TTY=|) { } elsif ($message =~ m|^Set /proc/self/oom_adj to |) { + } elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) { } else { sendmsg($message, "scripts-spew"); Index: trunk/server/fedora/config/etc/syslog-ng/syslog-ng.conf =================================================================== --- trunk/server/fedora/config/etc/syslog-ng/syslog-ng.conf (revision 2053) +++ trunk/server/fedora/config/etc/syslog-ng/syslog-ng.conf (revision 2066) @@ -1,2 +1,4 @@ +@version:3.2 + # syslog-ng configuration file. # @@ -8,5 +10,5 @@ options { - sync (0); + flush_lines (0); time_reopen (10); log_fifo_size (1000); @@ -16,8 +18,9 @@ create_dirs (no); keep_hostname (yes); + stats_freq (0); }; source s_sys { - file ("/proc/kmsg" log_prefix("kernel: ")); + file ("/proc/kmsg" program_override("kernel: ")); unix-stream ("/dev/log"); internal(); @@ -28,5 +31,5 @@ destination d_mesg { file("/var/log/messages"); }; destination d_auth { file("/var/log/secure"); }; -destination d_mail { file("/var/log/maillog" sync(10)); }; +destination d_mail { file("/var/log/maillog" flush_lines(10)); }; destination d_spol { file("/var/log/spooler"); }; destination d_boot { file("/var/log/boot.log"); }; Index: trunk/server/fedora/config/etc/yum.conf =================================================================== --- trunk/server/fedora/config/etc/yum.conf (revision 2053) +++ trunk/server/fedora/config/etc/yum.conf (revision 2066) @@ -9,5 +9,5 @@ plugins=1 metadata_expire=1800 -installonlypkgs=kernel kernel-devel kmod-openafs +installonlypkgs=kernel kernel-devel kmod-openafs ghc-cgi ghc-cgi-devel # PUT YOUR REPOS HERE OR IN separate files named file.repo Index: trunk/server/fedora/config/etc/yum.repos.d/scripts.repo =================================================================== --- trunk/server/fedora/config/etc/yum.repos.d/scripts.repo (revision 2053) +++ trunk/server/fedora/config/etc/yum.repos.d/scripts.repo (revision 2066) @@ -1,5 +1,5 @@ [scripts] name=Scripts -baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc13/ +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15/ enabled=1 gpgcheck=0 @@ -7,5 +7,5 @@ [scripts-testing] name=Scripts Testing -baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc13-testing/ +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15-testing/ enabled=0 gpgcheck=0 Index: trunk/server/fedora/config/etc/yum/post-actions/capoverride.action =================================================================== --- trunk/server/fedora/config/etc/yum/post-actions/capoverride.action (revision 2066) +++ trunk/server/fedora/config/etc/yum/post-actions/capoverride.action (revision 2066) @@ -0,0 +1,7 @@ +/usr/sbin/mtr:install:setcap -r /usr/sbin/mtr +/usr/bin/rsh:install:setcap -r /usr/bin/rsh +/usr/bin/rcp:install:setcap -r /usr/bin/rcp +/usr/bin/gnome-keyring-daemon:install:setcap -r /usr/bin/gnome-keyring-daemon +/usr/bin/newrole:install:setcap -r /usr/bin/newrole +/usr/bin/rlogin:install:setcap -r /usr/bin/rlogin +/usr/libexec/pt_chown:install:setcap -r /usr/libexec/pt_chown Index: trunk/server/fedora/config/etc/yum/post-actions/statoverride.action =================================================================== --- trunk/server/fedora/config/etc/yum/post-actions/statoverride.action (revision 2053) +++ trunk/server/fedora/config/etc/yum/post-actions/statoverride.action (revision 2066) @@ -22,8 +22,10 @@ /usr/bin/write:install:chmod ug-s /usr/bin/write /usr/bin/Xorg:install:chmod ug-s /usr/bin/Xorg -/usr/kerberos/bin/ksu:install:chmod ug-s /usr/kerberos/bin/ksu +/usr/bin/ksu:install:chmod ug-s /usr/bin/ksu /usr/lib64/nspluginwrapper/plugin-config:install:chmod ug-s /usr/lib64/nspluginwrapper/plugin-config /usr/lib64/vte/gnome-pty-helper:install:chmod ug-s /usr/lib64/vte/gnome-pty-helper +/usr/libexec/kde4/kpac_dhcp_helper:install:chmod ug-s /usr/libexec/kde4/kpac_dhcp_helper /usr/sbin/ccreds_chkpwd:install:chmod ug-s /usr/sbin/ccreds_chkpwd /usr/sbin/userisdnctl:install:chmod ug-s /usr/sbin/userisdnctl /usr/sbin/usernetctl:install:chmod ug-s /usr/sbin/usernetctl +/usr/bin/pkexec:install:chmod ug-s /usr/bin/pkexec Index: trunk/server/fedora/specs/curl.spec.patch =================================================================== --- trunk/server/fedora/specs/curl.spec.patch (revision 2053) +++ (revision ) @@ -1,57 +1,0 @@ ---- curl.spec.orig 2011-07-01 16:31:16.000000000 -0400 -+++ curl.spec 2011-07-01 16:30:24.000000000 -0400 -@@ -1,7 +1,7 @@ - Summary: A utility for getting files from remote servers (FTP, HTTP, and others) - Name: curl - Version: 7.20.1 --Release: 5%{?dist} -+Release: 5.scripts.%{scriptsversion}%{?dist} - License: MIT - Group: Applications/Internet - Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma -@@ -90,6 +90,9 @@ - # workaround for broken applications using curl multi (#599340) - Patch108: 0108-curl-7.20.1-threaded-dns-multi.patch - -+# disable credential delegation over Negotiate (CVE-2011-2192) -+Patch1000: curl-gssapi-delegation.patch -+ - Provides: webclient - URL: http://curl.haxx.se/ - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -@@ -190,6 +193,7 @@ - %patch105 -p1 - %patch106 -p1 - %patch108 -p1 -+%patch1000 -p1 - - # other patches - %patch15 -p1 -@@ -225,16 +229,6 @@ - - make %{?_smp_mflags} - --%check --LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} --export LD_LIBRARY_PATH --cd tests --make %{?_smp_mflags} -- --# use different port range for 32bit and 64bit build, thus make it possible --# to run both in parallel on the same machine --./runtests.pl -a -b%{?__isa_bits}90 -p -v -- - %install - rm -rf $RPM_BUILD_ROOT - -@@ -289,6 +283,10 @@ - %{_datadir}/aclocal/libcurl.m4 - - %changelog -+* Fri Jul 01 2011 Geoffrey Thomas 7.20.1-5.scripts -+- disable credential delegation over Negotiate (CVE-2011-2192) -+ Patch from upstream: http://curl.haxx.se/docs/adv_20110623.html -+ - * Fri Nov 26 2010 Kamil Dudka 7.20.1-5 - - do not send QUIT to a dead FTP control connection (#650255) - - prevent FTP client from hanging on unrecognized ABOR response (#649347) Index: trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec =================================================================== --- trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 2053) +++ trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec (revision 2066) @@ -1,21 +1,22 @@ +# For Haskell Packaging Guidelines see: +# - https://fedoraproject.org/wiki/Packaging:Haskell +# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name MonadCatchIO-mtl +# common part of summary for all the subpackages %global common_summary Haskell %{pkg_name} library +# main description used for all the subpackages %global common_description A %{pkg_name} library for Haskell. -# add any Haskell library dependencies here: +# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) %global ghc_pkg_deps ghc-mtl-devel -# add any foreign library dependencies here: +# foreign library dependencies (used for buildrequires and devel subpkg requires) #%%global ghc_pkg_c_deps @CDEP1@-devel -%bcond_without shared - -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} -Version: 0.3.0.1 +Version: 0.3.0.2 Release: 0.%{scriptsversion}%{?dist} Summary: %{common_summary} @@ -23,11 +24,12 @@ Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.0 +# macros for building haskell packages +BuildRequires: ghc-rpm-macros >= 0.7.3 +BuildRequires: hscolour %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} @@ -35,10 +37,4 @@ %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif - - -%{?ghc_lib_package} @@ -52,13 +48,16 @@ %install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install -%clean -rm -rf $RPM_BUILD_ROOT +# define the devel and prof subpkgs, devel post[un] scripts, and filelists: +# ghc-%pkg_name{,devel,prof}.files +%ghc_lib_package %changelog +* Mon May 2 2011 Alexander Chernyakhovsky - 0.3.0.2-0 +- regenerated packaging with cabal2spec-0.22.5 + * Thu Sep 9 2010 Anders Kaseorg - 0.3.0.1-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: trunk/server/fedora/specs/ghc-cgi.spec =================================================================== --- trunk/server/fedora/specs/ghc-cgi.spec (revision 2053) +++ trunk/server/fedora/specs/ghc-cgi.spec (revision 2066) @@ -1,21 +1,22 @@ +# For Haskell Packaging Guidelines see: +# - https://fedoraproject.org/wiki/Packaging:Haskell +# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name cgi +# common part of summary for all the subpackages %global common_summary Haskell %{pkg_name} library +# main description used for all the subpackages %global common_description A %{pkg_name} library for Haskell. -# add any Haskell library dependencies here: +# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) %global ghc_pkg_deps ghc-network-devel, ghc-parsec-devel, ghc-mtl-devel, ghc-MonadCatchIO-mtl-devel, ghc-xhtml-devel -# add any foreign library dependencies here: +# foreign library dependencies (used for buildrequires and devel subpkg requires) #%%global ghc_pkg_c_deps @CDEP1@-devel -%bcond_without shared - -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} -Version: 3001.1.8.1 +Version: 3001.1.8.2 Release: 0.%{scriptsversion}%{?dist} Summary: %{common_summary} @@ -23,11 +24,12 @@ Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.0 +# macros for building haskell packages +BuildRequires: ghc-rpm-macros >= 0.7.3 +BuildRequires: hscolour %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} @@ -35,10 +37,4 @@ %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif - - -%{?ghc_lib_package} @@ -52,13 +48,16 @@ %install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install -%clean -rm -rf $RPM_BUILD_ROOT +# define the devel and prof subpkgs, devel post[un] scripts, and filelists: +# ghc-%pkg_name{,devel,prof}.files +%ghc_lib_package %changelog +* Mon May 2 2011 Alexander Chernyakhovsky - 3001.1.8.2-0 +- regenerated packaging with cabal2spec-0.22.5 + * Thu Sep 9 2010 Anders Kaseorg - 3001.1.8.1-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: trunk/server/fedora/specs/ghc-unix-handle.spec =================================================================== --- trunk/server/fedora/specs/ghc-unix-handle.spec (revision 2053) +++ trunk/server/fedora/specs/ghc-unix-handle.spec (revision 2066) @@ -1,18 +1,19 @@ +# For Haskell Packaging Guidelines see: +# - https://fedoraproject.org/wiki/Packaging:Haskell +# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name unix-handle +# common part of summary for all the subpackages %global common_summary Haskell %{pkg_name} library +# main description used for all the subpackages %global common_description A %{pkg_name} library for Haskell. -# add any Haskell library dependencies here: +# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) #%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel -# add any foreign library dependencies here: +# foreign library dependencies (used for buildrequires and devel subpkg requires) #%%global ghc_pkg_c_deps @CDEP1@-devel - -%bcond_without shared - -# debuginfo is not useful for ghc -%global debug_package %{nil} Name: ghc-%{pkg_name} @@ -23,11 +24,12 @@ Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.0 +# macros for building haskell packages +BuildRequires: ghc-rpm-macros >= 0.7.3 +BuildRequires: hscolour %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} @@ -35,10 +37,4 @@ %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif - - -%{?ghc_lib_package} @@ -52,13 +48,16 @@ %install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install -%clean -rm -rf $RPM_BUILD_ROOT +# define the devel and prof subpkgs, devel post[un] scripts, and filelists: +# ghc-%pkg_name{,devel,prof}.files +%ghc_lib_package %changelog +* Mon May 2 2011 Alexander Chernyakhovsky - 0.0.0-0 +- regenerated packaging with cabal2spec-0.22.5 + * Thu Sep 9 2010 Anders Kaseorg - 0.0.0-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: trunk/server/fedora/specs/httpd.spec.patch =================================================================== --- trunk/server/fedora/specs/httpd.spec.patch (revision 2053) +++ trunk/server/fedora/specs/httpd.spec.patch (revision 2066) @@ -1,18 +1,18 @@ ---- httpd.spec.orig 2010-10-27 08:26:15.000000000 -0400 -+++ httpd.spec 2010-11-18 18:20:43.000000000 -0500 -@@ -7,7 +7,7 @@ +--- httpd.spec.orig 2011-09-13 09:43:36.000000000 -0400 ++++ httpd.spec 2011-11-05 20:57:13.910145847 -0400 +@@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd - Version: 2.2.17 --Release: 1%{?dist}.1 -+Release: 1%{?dist}.1.scripts.%{scriptsversion} + Version: 2.2.21 +-Release: 1%{?dist} ++Release: 1%{?dist}.scripts.%{scriptsversion} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html -@@ -55,6 +55,14 @@ - Conflicts: pcre < 4.0 - Requires: httpd-tools = %{version}-%{release}, apr-util-ldap +@@ -54,6 +54,15 @@ + Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa} + Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units -+Provides: scripts-httpd ++Provides: scripts-httpd = %{version}-%{release} +Patch1000: httpd-suexec-scripts.patch +Patch1003: httpd-2.2.x-mod_status-security.patch @@ -21,25 +21,38 @@ +Patch1006: httpd-suexec-cloexec.patch +Patch1007: httpd-fixup-vhost.patch ++Patch1008: httpd-sysv-deps.patch + %description The Apache HTTP Server is a powerful, efficient, and extensible web server. -@@ -65,6 +73,7 @@ +@@ -64,6 +73,7 @@ Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel Requires: apr-devel, apr-util-devel, pkgconfig Requires: httpd = %{version}-%{release} -+Provides: scripts-httpd-devel ++Provides: scripts-httpd-devel = %{version}-%{release} %description devel The httpd-devel package contains the APXS binary and other files -@@ -103,6 +112,7 @@ - Requires(post): openssl >= 0.9.7f-4, /bin/cat +@@ -102,6 +112,7 @@ + Requires(post): openssl, /bin/cat Requires(pre): httpd - Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn} + Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa} +Provides: scripts-mod_ssl Obsoletes: stronghold-mod_ssl %description -n mod_ssl -@@ -130,6 +140,13 @@ +@@ -110,6 +121,11 @@ + Security (TLS) protocols. + + %prep ++ ++# Horrible hack to patch the httpd.init file ++cd $RPM_SOURCE_DIR ++%patch1008 -p1 -b .sysv-deps ++ + %setup -q + %patch1 -p1 -b .apctl + %patch2 -p1 -b .apxs +@@ -128,6 +144,13 @@ # Patch in vendor/release string sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 @@ -55,5 +68,5 @@ vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` if test "x${vmmn}" != "x%{mmn}"; then -@@ -177,10 +194,12 @@ +@@ -175,10 +198,12 @@ --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --enable-suexec --with-suexec \ Index: trunk/server/fedora/specs/krb5.spec.patch =================================================================== --- trunk/server/fedora/specs/krb5.spec.patch (revision 2053) +++ trunk/server/fedora/specs/krb5.spec.patch (revision 2066) @@ -1,16 +1,16 @@ ---- krb5.spec.orig 2011-04-13 14:56:35.000000000 -0400 -+++ krb5.spec 2011-04-27 02:52:07.000000000 -0400 -@@ -10,7 +10,7 @@ +--- krb5.spec.orig 2011-11-16 12:37:32.246736120 -0500 ++++ krb5.spec 2011-11-16 12:42:47.134740975 -0500 +@@ -6,7 +6,7 @@ Summary: The Kerberos network authentication system Name: krb5 - Version: 1.7.1 --Release: 19%{?dist} -+Release: 19%{?dist}.scripts.%{scriptsversion} + Version: 1.9.1 +-Release: 14%{?dist} ++Release: 14%{?dist}.scripts.%{scriptsversion} # Maybe we should explode from the now-available-to-everybody tarball instead? - # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar + # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.1-signed.tar Source0: krb5-%{version}.tar.gz -@@ -98,6 +98,8 @@ - Patch109: krb5-1.7.1-paren.patch - Patch110: 2011-004-patch-r18.txt +@@ -65,6 +65,8 @@ + Patch89: krb5-1.9.1-sendto_poll3.patch + Patch90: krb5-1.9-MITKRB5-SA-2011-006.patch +Patch1000: krb5-kuserok-scripts.patch @@ -19,5 +19,5 @@ URL: http://web.mit.edu/kerberos/www/ Group: System Environment/Libraries -@@ -142,6 +144,7 @@ +@@ -114,6 +116,7 @@ %package libs Summary: The shared libraries used by Kerberos 5 @@ -27,8 +27,8 @@ %description libs Kerberos is a network authentication system. The krb5-libs package -@@ -1696,6 +1699,7 @@ - %patch108 -p1 -b .2011-003 - %patch109 -p1 -b .paren - %patch110 -p1 -b .2011-004 +@@ -221,6 +224,7 @@ + %patch88 -p1 -b .crossrealm + %patch89 -p1 -b .sendto_poll3 + %patch90 -p1 -b .2011-006 +%patch1000 -p1 -b .kuserok gzip doc/*.ps Index: trunk/server/fedora/specs/openafs-include-xstat.spec.patch =================================================================== --- trunk/server/fedora/specs/openafs-include-xstat.spec.patch (revision 2053) +++ trunk/server/fedora/specs/openafs-include-xstat.spec.patch (revision 2066) @@ -1,14 +1,14 @@ ---- openafs.spec.orig 2011-10-19 16:05:41.000000000 -0400 -+++ openafs.spec 2011-10-19 16:10:06.000000000 -0400 -@@ -1115,7 +1115,7 @@ +--- openafs.spec.orig 2011-11-04 23:50:34.842221577 -0400 ++++ openafs.spec 2011-11-04 23:52:00.538590290 -0400 +@@ -1103,7 +1103,7 @@ # create list of man pages that go in the 'openafs' package /bin/ls $RPM_BUILD_ROOT%{_mandir}/man1 \ -- |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^rxdebug|scout|^sys|tokens|translate|udebug|unlog|^uss|^vos' \ -+ |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^rxdebug|scout|^sys|tokens|translate|^xstat|udebug|unlog|^uss|^vos' \ +- |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^restorevol|^rxdebug|scout|^sys|tokens|translate|udebug|unlog|^uss|^vos' \ ++ |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^restorevol|^rxdebug|scout|^sys|tokens|translate|^xstat|udebug|unlog|^uss|^vos' \ + |egrep -v '^afs_compile_et' \ >openafs-man1files - /bin/ls $RPM_BUILD_ROOT%{_mandir}/man5 \ -@@ -1145,6 +1145,8 @@ +@@ -1134,6 +1134,8 @@ %{_bindir}/tokens %{_bindir}/tokens.krb @@ -19,5 +19,5 @@ %{_bindir}/unlog %{_sbindir}/backup -@@ -1196,7 +1198,7 @@ +@@ -1184,7 +1186,7 @@ done @@ -28,5 +28,5 @@ done -@@ -1208,7 +1210,7 @@ +@@ -1196,7 +1198,7 @@ rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump* Index: trunk/server/fedora/specs/openafs-systemd.spec.patch =================================================================== --- trunk/server/fedora/specs/openafs-systemd.spec.patch (revision 2066) +++ trunk/server/fedora/specs/openafs-systemd.spec.patch (revision 2066) @@ -0,0 +1,202 @@ +--- rpmbuild/SPECS/openafs.spec.orig 2011-10-17 23:46:35.000000000 -0400 ++++ rpmbuild/SPECS/openafs.spec 2011-10-17 23:48:41.000000000 -0400 +@@ -224,7 +224,7 @@ + BuildRoot: %{_tmppath}/%{name}-%{version}-root + Packager: OpenAFS Gatekeepers + Group: Networking/Filesystems +-BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison ++BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison, systemd-units + %if 0%{?fedora} + BuildRequires: perl-devel perl-ExtUtils-Embed + %endif +@@ -323,6 +323,12 @@ + %package client + Provides: scripts-openafs-client + Requires: binutils, openafs = %{version} ++%if 0%{?fedora} >= 15 ++Requires: systemd-units ++Requires(post): systemd-units, systemd-sysv ++Requires(preun): systemd-units ++Requires(postun): systemd-units ++%endif + + %if %{fedorakmod} + Requires: %{name}-kmod >= %{version} +@@ -347,6 +353,12 @@ + Requires: openafs = %{version} + Summary: OpenAFS Filesystem Server + Group: Networking/Filesystems ++%if 0%{?fedora} >= 15 ++Requires: systemd-units ++Requires(post): systemd-units, systemd-sysv ++Requires(preun): systemd-units ++Requires(postun): systemd-units ++%endif + + %description server + The AFS distributed filesystem. AFS is a distributed filesystem +@@ -999,7 +1011,12 @@ + mkdir -p $RPM_BUILD_ROOT%{_sbindir} + mkdir -p $RPM_BUILD_ROOT%{_libdir} + mkdir -p $RPM_BUILD_ROOT/etc/sysconfig ++%if 0%{?fedora} < 15 + mkdir -p $RPM_BUILD_ROOT%{initdir} ++%else ++mkdir -p $RPM_BUILD_ROOT%{_unitdir} ++mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules ++%endif + mkdir -p $RPM_BUILD_ROOT/etc/openafs + mkdir -p $RPM_BUILD_ROOT%{pamdir} + mkdir -p $RPM_BUILD_ROOT%{_prefix}/afs/etc +@@ -1029,8 +1046,14 @@ + + # Copy root.client config files + install -m 755 src/packaging/RedHat/openafs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/openafs ++%if 0%{?fedora} < 15 + install -m 755 src/packaging/RedHat/openafs-client.init $RPM_BUILD_ROOT%{initdir}/openafs-client + install -m 755 src/packaging/RedHat/openafs-server.init $RPM_BUILD_ROOT%{initdir}/openafs-server ++%else ++install -m 755 src/packaging/RedHat/openafs-client.service $RPM_BUILD_ROOT%{_unitdir}/openafs-client.service ++install -m 755 src/packaging/RedHat/openafs-client.modules $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/openafs-client.modules ++install -m 755 src/packaging/RedHat/openafs-server.service $RPM_BUILD_ROOT%{_unitdir}/openafs-server.service ++%endif + + # Copy PAM modules + install -m 755 ${sysname}/dest/lib/pam* $RPM_BUILD_ROOT%{pamdir} +@@ -1310,7 +1333,14 @@ + fi + + %post client ++%if 0%{?fedora} < 15 + chkconfig --add openafs-client ++%else ++if [ $1 -eq 1 ] ; then ++ # Initial installation ++ /bin/systemctl daemon-reload >/dev/null 2>&1 || : ++fi ++%endif + if [ ! -d /afs ]; then + mkdir /afs + chown root.root /afs +@@ -1327,10 +1357,17 @@ + + %post server + #on an upgrade, don't enable if we were disabled ++%if 0%{?fedora} < 15 + if [ $1 = 1 ] ; then + chkconfig --add openafs-server + fi + %{initdir}/openafs-server condrestart ++%else ++if [ $1 -eq 1 ] ; then ++ # Initial installation ++ /bin/systemctl daemon-reload >/dev/null 2>&1 || : ++fi ++%endif + + %if %{build_authlibs} + %post authlibs +@@ -1346,16 +1383,45 @@ + fi + + %preun client ++%if 0%{?fedora} < 15 + if [ $1 = 0 ] ; then + %{initdir}/openafs-client stop + chkconfig --del openafs-client + fi ++%else ++if [ $1 -eq 0 ] ; then ++ # Package removal, not upgrade ++ /bin/systemctl --no-reload disable openafs-client.service > /dev/null 2>&1 || : ++ /bin/systemctl stop openafs-client.service > /dev/null 2>&1 || : ++fi ++%endif + + %preun server ++%if 0%{?fedora} < 15 + if [ $1 = 0 ] ; then + %{initdir}/openafs-server stop + chkconfig --del openafs-server + fi ++%else ++if [ $1 -eq 0 ] ; then ++ /bin/systemctl --no-reload disable openafs-server.service > /dev/null 2>&1 || : ++ /bin/systemctl stop openafs-server.service > /dev/null 2>&1 || : ++fi ++%endif ++ ++%postun client ++/bin/systemctl daemon-reload >/dev/null 2>&1 || : ++if [ $1 -ge 1 ] ; then ++ # Package upgrade, not uninstall ++ /bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || : ++fi ++ ++%postun server ++/bin/systemctl daemon-reload >/dev/null 2>&1 || : ++if [ $1 -ge 1 ] ; then ++ # Package upgrade, not uninstall ++ /bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : ++fi + + %if %{build_dkmspkg} + %post -n dkms-%{name} +@@ -1413,6 +1479,32 @@ + %endif + %endif + ++%triggerun -- openafs-client < 1.6.0-1 ++# Save the current service runlevel info ++# User must manually run systemd-sysv-convert --apply httpd ++# to migrate them to systemd targets ++/usr/bin/systemd-sysv-convert --save openafs-client >/dev/null 2>&1 ||: ++ ++# If the package is allowed to autostart: ++/bin/systemctl --no-reload enable openafs-client.service >/dev/null 2>&1 ||: ++ ++# Run these because the SysV package being removed won't do them ++/sbin/chkconfig --del openafs-client >/dev/null 2>&1 || : ++/bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || : ++ ++%triggerun -- openafs-server < 1.6.0-1 ++# Save the current service runlevel info ++# User must manually run systemd-sysv-convert --apply httpd ++# to migrate them to systemd targets ++/usr/bin/systemd-sysv-convert --save openafs-server >/dev/null 2>&1 ||: ++ ++# If the package is allowed to autostart: ++/bin/systemctl --no-reload enable openafs-server.service >/dev/null 2>&1 ||: ++ ++# Run these because the SysV package being removed won't do them ++/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || : ++/bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : ++ + ############################################################################## + ### + ### file lists +@@ -1450,7 +1542,12 @@ + %{pamdir}/pam_afs.krb.so + %{pamdir}/pam_afs.so.1 + %{pamdir}/pam_afs.so ++%if 0%{?fedora} < 15 + %{initdir}/openafs-client ++%else ++%{_unitdir}/openafs-client.service ++%{_sysconfdir}/sysconfig/modules/openafs-client.modules ++%endif + %{_mandir}/man1/cmdebug.* + %{_mandir}/man1/copyauth.* + %{_mandir}/man1/up.* +@@ -1498,7 +1595,11 @@ + %{_sbindir}/vldb_check + %{_sbindir}/vldb_convert + %{_sbindir}/voldump ++%if 0%{?fedora} < 15 + %{initdir}/openafs-server ++%else ++%{_unitdir}/openafs-server.service ++%endif + %{_mandir}/man5/AuthLog.* + %{_mandir}/man5/BackupLog.* + %{_mandir}/man5/BosConfig.* Index: trunk/server/fedora/specs/openafs.spec.patch =================================================================== --- trunk/server/fedora/specs/openafs.spec.patch (revision 2053) +++ trunk/server/fedora/specs/openafs.spec.patch (revision 2066) @@ -1,25 +1,29 @@ ---- openafs.spec.orig 2010-09-10 18:21:53.000000000 -0400 -+++ openafs.spec 2010-09-10 18:34:30.000000000 -0400 -@@ -8,7 +8,7 @@ - # for beta/rc releases make pkgrel 0.X. +--- rpmbuild/SPECS/openafs.spec ++++ rpmbuild/SPECS/openafs.spec.~3~ 2011-11-20 20:13:52.211673609 -0500 +@@ -4,7 +4,7 @@ + %define pkgvers 1.6.0 + # for beta/rc releases make pkgrel 0. # for real releases make pkgrel 1 (or more for extra releases) - #%define pkgrel 0.1.rc1 --%define pkgrel 0.pre3 -+%define pkgrel 0.pre3.99scripts.%{scriptsversion} +-%define pkgrel 1 ++%define pkgrel 1.99.scripts.%{scriptsversion} - %if %{?osvers:0}%{!?osvers:1} - %define osvers 1 -@@ -261,6 +261,10 @@ - %endif + %{!?fedorakmod: %define fedorakmod 1} + %{!?build_dkmspkg: %define build_dkmspkg 1} +@@ -237,6 +237,14 @@ + ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 +Patch1000: openafs-scripts.patch -+Patch1003: openafs-localcsdb.patch -+Patch1005: openafs-numsysnames.patch ++Patch1001: openafs-localcsdb.patch ++Patch1002: openafs-systemd.patch ++Patch1003: openafs-systemd-crond.patch ++Patch1004: openafs-linux-3.1-rcu.patch ++Patch1005: openafs-linux-3.1-fsync.patch ++Patch1006: openafs-linux-3.1-zalloc.patch + # http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 -@@ -343,6 +347,7 @@ +@@ -316,6 +324,7 @@ %if %{build_userspace} @@ -29,5 +33,5 @@ %if %{fedorakmod} -@@ -403,6 +408,7 @@ +@@ -376,6 +385,7 @@ %if %{build_authlibs} @@ -37,5 +41,5 @@ Group: Networking/Filesystems -@@ -419,6 +425,7 @@ +@@ -392,6 +402,7 @@ %endif @@ -43,7 +47,7 @@ +Provides: scripts-openafs-authlibs-devel %if %{build_authlibs} - Requires: openafs-authlibs = %{version} + Requires: openafs-authlibs = %{version}-%{release} %endif -@@ -437,6 +444,7 @@ +@@ -410,6 +421,7 @@ libraries. @@ -52,6 +56,6 @@ Summary: OpenAFS Development Libraries and Headers Group: Development/Filesystems - -@@ -465,6 +473,7 @@ + Requires: openafs = %{version}-%{release} +@@ -439,6 +451,7 @@ administrators. @@ -61,5 +65,5 @@ Group: Networking/Filesystems Provides: openafs-kernel = %{version} -@@ -514,6 +523,7 @@ +@@ -488,6 +501,7 @@ %if %{krb5support} @@ -69,5 +73,5 @@ Requires: openafs = %{version} Group: Networking/Filesystems -@@ -540,7 +550,7 @@ +@@ -514,7 +528,7 @@ %if %{build_modules} @@ -78,12 +82,32 @@ %else -@@ -699,6 +709,9 @@ +@@ -671,6 +685,15 @@ + #%setup -q -n %{srcdir} + %setup -q -b 1 -n %{srcdir} - # Patch openafs to build a kernel module named "openafs" instead of "libafs" - %patch0 -p1 -b .kmod26 ++# Apply the Scripts patch +%patch1000 -p1 -b .scripts -+%patch1003 -p1 -b .localcsdb -+%patch1005 -p1 -b .numsysnames - ++%patch1001 -p1 -b .localcsdb ++%patch1002 -p1 -b .systemd ++%patch1003 -p1 -b .systemd-crond ++%patch1004 -p1 -b .rcu ++%patch1005 -p1 -b .fsync ++%patch1006 -p1 -b .zalloc ++ ############################################################################## # + # building +@@ -1212,6 +1235,13 @@ + rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so + rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* + rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* ++%else ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so ++chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.* + %endif + + %endif Index: trunk/server/fedora/specs/openssh.spec.patch =================================================================== --- trunk/server/fedora/specs/openssh.spec.patch (revision 2053) +++ trunk/server/fedora/specs/openssh.spec.patch (revision 2066) @@ -1,38 +1,37 @@ --- openssh.spec.orig 2010-05-31 06:20:02.000000000 -0400 +++ openssh.spec 2010-09-06 21:53:21.000000000 -0400 -@@ -74,7 +74,7 @@ +@@ -78,7 +78,7 @@ Summary: An open source implementation of SSH protocol versions 1 and 2 Name: openssh - Version: 5.4p1 --Release: %{openssh_rel}%{?dist}%{?rescue_rel} -+Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion} + Version: %{openssh_ver} +-Release: %{openssh_rel}%{?dist}%{?rescue_rel}.1 ++Release: %{openssh_rel}%{?dist}%{?rescue_rel}.1.scripts.%{scriptsversion} URL: http://www.openssh.com/portable.html #URL1: http://pamsshagentauth.sourceforge.net #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz -@@ -88,6 +88,8 @@ +@@ -92,6 +92,7 @@ Source3: sshd.init Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2 Source5: pam_ssh_agent-rmheaders +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch -+Patch1002: openssh-no-spurious-correct-key-incorrect-host-messages.patch - Patch0: openssh-5.4p1-redhat.patch - Patch2: openssh-5.3p1-skip-initial.patch - Patch4: openssh-5.2p1-vendor.patch -@@ -175,6 +178,7 @@ - Requires(post): chkconfig >= 0.9, /sbin/service + + Patch100: openssh-5.6p1-wIm.patch + Patch0: openssh-5.6p1-redhat.patch +@@ -207,6 +209,7 @@ Requires(pre): /usr/sbin/useradd Requires: pam >= 1.0.1-3 + Requires: fipscheck-lib%{_isa} >= 1.3.0 +Provides: scripts-openssh-server - %package askpass - Summary: A passphrase dialog for OpenSSH and X -@@ -267,6 +271,9 @@ - %patch75 -p1 -b .dso - %patch76 -p1 -b .bz595935 + %if %{ldap} + %package ldap +@@ -323,6 +326,8 @@ + %patch80 -p1 -b .biguid + %patch81 -p1 -b .clientloop +%patch1001 -p1 -b .gssapi-env -+%patch1002 -p1 -b .no-spurious-correct-key-incorrect-host-messages + autoreconf - - %build + pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} + autoreconf + Index: trunk/server/fedora/specs/python-routefs.spec =================================================================== --- trunk/server/fedora/specs/python-routefs.spec (revision 2053) +++ (revision ) @@ -1,55 +1,0 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -Name: python-routefs -Version: 0.0.1 -Release: 1%{?dist} -Summary: A FUSE API wrapper based on URL routing - -Group: Development/Languages -License: MIT -URL: http://ebroder.net/code/python-routefs.git -Source0: python-routefs.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: python-devel -BuildRequires: python-routes >= 1.7 -BuildRequires: fuse-python >= 0.2 -Requires: python-routes >= 1.7 -Requires: fuse-python >= 0.2 - -%description - -RouteFS is a base class for developing read-only FUSE filesystems that -lets you focus on the directory tree instead of the system calls. - -RouteFS uses the Routes library developed for Pylons. URLs were -inspired by filesystems, and now you can have filesystems inspired by -URLs. - - -%prep -%setup -q -n %{name} - - -%build -%{__python} setup.py build - - -%install -rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc -%{python_sitelib}/* - - -%changelog -* Sun Sep 14 2008 Anders Kaseorg - 0.0.1 -- Initial RPM release. Index: trunk/server/fedora/specs/redland-bindings.spec.patch =================================================================== --- trunk/server/fedora/specs/redland-bindings.spec.patch (revision 2053) +++ trunk/server/fedora/specs/redland-bindings.spec.patch (revision 2066) @@ -1,9 +1,9 @@ ---- redland-bindings.spec 2011-10-12 14:51:58.000000000 -0400 -+++ redland-bindings-php.spec 2011-10-13 10:15:24.000000000 -0400 +--- redland-bindings.spec.old 2011-10-12 14:51:58.000000000 -0400 ++++ redland-bindings.spec 2011-10-13 10:15:24.000000000 -0400 @@ -1,6 +1,6 @@ Name: redland-bindings - Version: 1.0.7.1 --Release: 1%{?dist} -+Release: 1%{?dist}.scripts.%{scriptsversion} + Version: 1.0.11.1 +-Release: 6%{?dist} ++Release: 6%{?dist}.scripts.%{scriptsversion} Summary: Redland RDF Application Framework API Bindings Index: trunk/server/fedora/specs/rubygems.spec.patch =================================================================== --- trunk/server/fedora/specs/rubygems.spec.patch (revision 2066) +++ trunk/server/fedora/specs/rubygems.spec.patch (revision 2066) @@ -0,0 +1,30 @@ +--- rubygems.spec.orig 2011-11-04 14:16:37.000000000 -0400 ++++ rubygems.spec 2011-11-04 14:32:02.000000000 -0400 +@@ -15,7 +15,7 @@ + Summary: The Ruby standard for packaging ruby libraries + Name: rubygems + Version: 1.7.2 +-Release: 3%{?dist} ++Release: 3%{?dist}.scripts.%{scriptsversion} + Group: Development/Libraries + # No GPL version is specified. + License: Ruby or GPL+ +@@ -40,6 +40,9 @@ + # ... and spec_file is not supported yet + Patch7: rubygems-1.7.2-escape-string-skip-test.patch + ++Provides: scripts-rubygems = %{version}-%{release} ++Patch1000: rubygems-rails-require-thread.patch ++ + Requires: ruby(abi) = 1.8 + Requires: ruby >= 1.8.7 + Requires: ruby-rdoc +@@ -69,6 +72,8 @@ + %patch6 -p1 -b .esc + %patch7 -p1 -b .esc.skip + ++%patch1000 -p1 -b .thread ++ + # Some of the library files start with #! which rpmlint doesn't like + # and doesn't make much sense + for f in `find lib -name \*.rb` ; do Index: trunk/server/fedora/specs/scripts-base.spec =================================================================== --- trunk/server/fedora/specs/scripts-base.spec (revision 2053) +++ trunk/server/fedora/specs/scripts-base.spec (revision 2066) @@ -21,4 +21,6 @@ Requires: scripts-openafs-krb5 Requires: scripts-openssh-server +Requires: scripts-static-cat +Requires: scripts-rubygems Requires: sql-signup Requires: tokensys Index: trunk/server/fedora/specs/scripts-python-path.spec =================================================================== --- trunk/server/fedora/specs/scripts-python-path.spec (revision 2053) +++ (revision ) @@ -1,37 +1,0 @@ -Summary: scripts.mit.edu python path configuration -Group: Development/Languages -Name: scripts-python-path -Version: 0.%{scriptsversion} -Release: 0 -Vendor: The scripts.mit.edu Team (scripts@mit.edu) -URL: http://scripts.mit.edu -License: GPL -Source: %{name}.tar.gz -BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root - -%description - -scripts.mit.edu python path configuration -See http://scripts.mit.edu/wiki for more information. - -%prep -%setup -q -n %{name} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -%install -[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{python_sitelib} -install -m 644 00scripts-home.pth $RPM_BUILD_ROOT%{python_sitelib} - -%clean -[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT - -%files -%defattr(0644, root, root) -%{python_sitelib}/00scripts-home.pth - -%changelog -* Thu Jul 9 2009 Geoffrey Thomas -- Update to Python 2.6 -* Tue Jan 27 2009 Quentin Smith -- initial release Index: trunk/server/fedora/specs/scripts-static-cat.spec =================================================================== --- trunk/server/fedora/specs/scripts-static-cat.spec (revision 2053) +++ trunk/server/fedora/specs/scripts-static-cat.spec (revision 2066) @@ -1,8 +1,5 @@ -# link with shared libs -# andersk: Disabled for 3x faster startup speed. -#%%bcond_without dynamic - -# ghc does not emit debug information -%global debug_package %{nil} +# For Haskell Packaging Guidelines see: +# - https://fedoraproject.org/wiki/Packaging:Haskell +# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell Name: scripts-static-cat @@ -15,8 +12,8 @@ URL: http://scripts.mit.edu/ Source0: %{name}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 +BuildRequires: ghc-devel +# macros for building haskell packages BuildRequires: ghc-rpm-macros >= 0.7.0 BuildRequires: ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel @@ -35,10 +32,5 @@ %install -rm -rf $RPM_BUILD_ROOT %ghc_bin_install - - -%clean -rm -rf $RPM_BUILD_ROOT @@ -49,4 +41,7 @@ %changelog +* Mon May 2 2011 Alexander Chernyakhovsky - 0.0-0 +- regenerated packaging with cabal2spec-0.22.5 + * Thu Sep 9 2010 Anders Kaseorg - 0.0-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.1 Index: trunk/server/fedora/specs/tokensys.spec =================================================================== --- trunk/server/fedora/specs/tokensys.spec (revision 2053) +++ trunk/server/fedora/specs/tokensys.spec (revision 2066) @@ -10,5 +10,9 @@ BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root %define debug_package %{nil} -Prereq: /usr/kerberos/bin/kinit, /usr/bin/aklog +Prereq: /usr/bin/kinit, /usr/bin/aklog +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +BuildRequires: systemd-units %description @@ -17,5 +21,6 @@ Contains: - A shell script for renewing the scripts AFS credentials - - A crontab for calling the renew script + - A shell script for configuring scripts AFS + - systemd units for running the above See http://scripts.mit.edu/wiki for more information. @@ -24,10 +29,13 @@ %build -./configure --with-kinit=/usr/kerberos/bin/kinit --with-aklog=/usr/bin/aklog +./configure --with-kinit=/usr/bin/kinit --with-aklog=/usr/bin/aklog --with-fs=/usr/bin/fs %install [ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT install -D renew $RPM_BUILD_ROOT/home/afsagent/renew -install -D crontab $RPM_BUILD_ROOT/etc/cron.d/afsagent +install -D scripts-afsagent-startup $RPM_BUILD_ROOT/usr/local/libexec/scripts-afsagent-startup +install -D scripts-afsagent-startup.service $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent-startup.service +install -D scripts-afsagent.service $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent.service +install -D scripts-afsagent.timer $RPM_BUILD_ROOT%{_unitdir}/scripts-afsagent.timer %clean @@ -35,8 +43,10 @@ %files -%defattr(0600, root, root) -/etc/cron.d/afsagent +%defattr(0644,root,root) +%{_unitdir}/*.service +%{_unitdir}/*.timer %defattr(0755, afsagent, afsagent) /home/afsagent/renew +/usr/local/libexec/scripts-afsagent-startup %pre @@ -44,5 +54,32 @@ useradd -u 101 -g 101 afsagent || [ $? -eq 9 ] +%post +/bin/systemctl enable scripts-afsagent-startup.service >/dev/null 2>&1 || : +/bin/systemctl enable scripts-afsagent.service >/dev/null 2>&1 || : +/bin/systemctl enable scripts-afsagent.timer >/dev/null 2>&1 || : + +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + +%preun +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable scripts-afsagent-startup.service > /dev/null 2>&1 || : + /bin/systemctl --no-reload disable scripts-afsagent.service > /dev/null 2>&1 || : + /bin/systemctl --no-reload disable scripts-afsagent.timer > /dev/null 2>&1 || : + /bin/systemctl stop scripts-afsagent-startup.service > /dev/null 2>&1 || : + /bin/systemctl stop scripts-afsagent.service > /dev/null 2>&1 || : + /bin/systemctl stop scripts-afsagent.timer > /dev/null 2>&1 || : +fi + %postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart scripts-afsagent.service >/dev/null 2>&1 || : +fi + if [ "$1" = "0" ] ; then userdel -r afsagent @@ -50,4 +87,8 @@ %changelog +* Mon Nov 21 2011 Quentin Smith +- add systemd units +- remove crontab + * Tue Aug 17 2010 Geoffrey Thomas - aklog csail as well Index: trunk/server/fedora/specs/whoisd.spec =================================================================== --- trunk/server/fedora/specs/whoisd.spec (revision 2053) +++ trunk/server/fedora/specs/whoisd.spec (revision 2066) @@ -1,16 +1,21 @@ -Summary: whoisd for (virtualhost aware) -Group: Applications/System -Name: whoisd -Version: 0.%{scriptsversion} -Release: 0 -Vendor: The scripts.mit.edu Team (scripts@mit.edu) -URL: http://scripts.mit.edu -License: GPL -Source0: %{name}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Summary: whoisd for (virtualhost aware) +Group: Applications/System +Name: whoisd +Version: 0.%{scriptsversion} +Release: 1 +Vendor: The scripts.mit.edu Team (scripts@mit.edu) +URL: http://scripts.mit.edu +License: GPL +Source0: %{name}.tar.gz + %define debug_package %{nil} -#BuildRequires: make -Requires: python-twisted-core +Requires: python-twisted-core +BuildRequires: systemd-units + +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +Requires(post): systemd-sysv %description @@ -24,17 +29,33 @@ %install -[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT exec_prefix=/usr/local -%clean -[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT +%post +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl enable scripts-whoisd.service >/dev/null 2>&1 || : +fi + +%preun +if [ $1 -eq 0 ]; then + /bin/systemctl --no-reload disable scripts-whoisd.service >/dev/null 2>&1 || : + /bin/systemctl stop scripts-whoisd.service > /dev/null 2>&1 || : +fi + +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ]; then + /bin/systemctl try-restart scripts-whoisd.service >/dev/null 2>&1 || : +fi %files %defattr(0644,root,root,-) /usr/local/libexec/whoisd.tac -%defattr(0600,root,root) -/etc/cron.d/whoisd +%defattr(0644,root,root) +/lib/systemd/system/scripts-whoisd.service %changelog +* Thu Aug 25 2011 Alexander Chernyakhovsky 0-1 +- package systemd service file * Tue Jun 03 2008 Joe Presbrey 0.00 Index: trunk/server/fedora/specs/zephyr.spec =================================================================== --- trunk/server/fedora/specs/zephyr.spec (revision 2053) +++ trunk/server/fedora/specs/zephyr.spec (revision 2066) @@ -1,4 +1,4 @@ Name: zephyr -Version: 3.0 +Version: 3.0.1 Release: 0.%{scriptsversion}%{?dist} Summary: Client programs for the Zephyr real-time messaging system @@ -71,5 +71,4 @@ make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT @@ -80,5 +79,12 @@ install -m755 zhm.init \ $RPM_BUILD_ROOT%{_initddir}/zhm - +# Make RPM's Provide: searcher actually search the .so files! A recent +# change in how RPM detects Provides automatically means that only +# files that are executable get searched. Without this hack, all of +# the zephyr client tools are Requires: libzephyr.so.4 which is never +# Provides:, leading to uninstallable RPMS. This can be removed when +# zephyr starts installing the libraries with mode 755 rather than +# 644. (Zephyr #79) +chmod a+x $RPM_BUILD_ROOT%{_libdir}/libzephyr.so.* %post @@ -139,4 +145,7 @@ %changelog +* Sat Apr 16 2011 Alexander Chernyakhovsky 3.0.1-0 +- Zephyr 3.0.1 + * Sun Sep 19 2010 Anders Kaseorg - 3.0-0 - Decrease version below a hypothetical Fedora package.