Index: branches/fc17-dev/server/fedora/specs/accountadm.spec =================================================================== --- branches/fc17-dev/server/fedora/specs/accountadm.spec (revision 2081) +++ branches/fc17-dev/server/fedora/specs/accountadm.spec (revision 2195) @@ -9,5 +9,5 @@ Source: %{name}.tar.gz BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root -BuildRequires: scripts-openafs-devel +BuildRequires: scripts-openafs-devel, scripts-openafs-authlibs-devel BuildRequires: hesinfo BuildRequires: openldap-clients @@ -25,5 +25,4 @@ Contains: - Perl script for checking whether a user is a locker admin - - setuid C program used to start a signup request - Perl script that handles signup requests - vhostadd,vhostedit: admin tools for adding and editing virtualhosts @@ -57,6 +56,4 @@ /usr/local/sbin/vhostedit /usr/local/sbin/ldap-backup -%defattr(4755, signup, signup) -/usr/local/sbin/signup-scripts-frontend %pre Index: branches/fc17-dev/server/fedora/specs/fuse-better-mousetrapfs.spec =================================================================== --- branches/fc17-dev/server/fedora/specs/fuse-better-mousetrapfs.spec (revision 2195) +++ branches/fc17-dev/server/fedora/specs/fuse-better-mousetrapfs.spec (revision 2195) @@ -0,0 +1,40 @@ +Summary: FUSE-Filesystem that logs and kills any accessors +Group: System Environment/Base +Name: fuse-better-mousetrapfs +Version: 0 +Release: 1.%{scriptsversion}%{?dist} +Vendor: The scripts.mit.edu Team (scripts@mit.edu) +URL: http://scripts.mit.edu +License: BSD +Source0: %{name}.tar.gz +BuildArch: noarch + +%define debug_package %{nil} + +Requires: fuse >= 2.2 +Requires: fuse-python + +%description +This is a FUSE-filesystem client which logs and kills any accessors. +It is useful for detecting compromised accounts which are performing +filesystem scans. + +%prep +%setup -q -n %{name} + +%build + +%install +rm -rf %{buildroot} +install -D better-mousetrapfs %{buildroot}/usr/sbin/better-mousetrapfs + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +/usr/sbin/better-mousetrapfs + +%changelog +* Mon Mar 26 2012 Edward Z. Yang - 0-1.2150 +- Initial release. Index: branches/fc17-dev/server/fedora/specs/httpd.spec.patch =================================================================== --- branches/fc17-dev/server/fedora/specs/httpd.spec.patch (revision 2081) +++ branches/fc17-dev/server/fedora/specs/httpd.spec.patch (revision 2195) @@ -1,8 +1,8 @@ ---- httpd.spec.orig 2011-09-13 09:43:36.000000000 -0400 -+++ httpd.spec 2011-11-05 20:57:13.910145847 -0400 +--- httpd.spec.~1~ 2012-02-13 09:46:36.000000000 -0500 ++++ httpd.spec 2012-03-26 01:33:53.247271289 -0400 @@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd - Version: 2.2.21 + Version: 2.2.22 -Release: 1%{?dist} +Release: 1%{?dist}.scripts.%{scriptsversion} @@ -26,5 +26,5 @@ The Apache HTTP Server is a powerful, efficient, and extensible web server. -@@ -64,6 +73,7 @@ +@@ -64,6 +76,7 @@ Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel Requires: apr-devel, apr-util-devel, pkgconfig @@ -34,5 +34,5 @@ %description devel The httpd-devel package contains the APXS binary and other files -@@ -102,6 +112,7 @@ +@@ -102,6 +115,7 @@ Requires(post): openssl, /bin/cat Requires(pre): httpd @@ -42,5 +42,5 @@ %description -n mod_ssl -@@ -110,6 +121,11 @@ +@@ -110,6 +124,11 @@ Security (TLS) protocols. @@ -54,5 +54,5 @@ %patch1 -p1 -b .apctl %patch2 -p1 -b .apxs -@@ -128,6 +144,13 @@ +@@ -128,6 +147,14 @@ # Patch in vendor/release string sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 @@ -64,9 +64,10 @@ +%patch1006 -p1 -b .cloexec +%patch1007 -p1 -b .fixup-vhost ++# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec + # Safety check: prevent build if defined MMN does not equal upstream MMN. vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` if test "x${vmmn}" != "x%{mmn}"; then -@@ -175,10 +198,12 @@ +@@ -175,10 +205,12 @@ --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --enable-suexec --with-suexec \ Index: branches/fc17-dev/server/fedora/specs/krb5.spec.patch =================================================================== --- branches/fc17-dev/server/fedora/specs/krb5.spec.patch (revision 2081) +++ branches/fc17-dev/server/fedora/specs/krb5.spec.patch (revision 2195) @@ -1,16 +1,16 @@ ---- krb5.spec.orig 2011-11-16 12:37:32.246736120 -0500 -+++ krb5.spec 2011-11-16 12:42:47.134740975 -0500 +--- krb5.spec.~1~ 2012-03-08 16:20:41.000000000 -0500 ++++ krb5.spec 2012-04-01 22:07:14.834013302 -0400 @@ -6,7 +6,7 @@ Summary: The Kerberos network authentication system Name: krb5 - Version: 1.9.1 --Release: 14%{?dist} -+Release: 14%{?dist}.scripts.%{scriptsversion} + Version: 1.9.3 +-Release: 1%{?dist} ++Release: 1%{?dist}.scripts.%{scriptsversion} # Maybe we should explode from the now-available-to-everybody tarball instead? - # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.1-signed.tar + # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.3-signed.tar Source0: krb5-%{version}.tar.gz -@@ -65,6 +65,8 @@ - Patch89: krb5-1.9.1-sendto_poll3.patch - Patch90: krb5-1.9-MITKRB5-SA-2011-006.patch +@@ -64,6 +64,8 @@ + Patch102: krb5-1.9-7048.patch + Patch103: krb5-kvno-230379.patch +Patch1000: krb5-kuserok-scripts.patch @@ -19,5 +19,5 @@ URL: http://web.mit.edu/kerberos/www/ Group: System Environment/Libraries -@@ -114,6 +116,7 @@ +@@ -113,6 +115,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 -@@ -221,6 +224,7 @@ - %patch88 -p1 -b .crossrealm - %patch89 -p1 -b .sendto_poll3 - %patch90 -p1 -b .2011-006 +@@ -219,6 +222,7 @@ + %patch101 -p1 -b .7047 + %patch102 -p1 -b .7048 + %patch103 -p1 -b .kvno +%patch1000 -p1 -b .kuserok gzip doc/*.ps Index: branches/fc17-dev/server/fedora/specs/openafs-systemd.spec.patch =================================================================== --- branches/fc17-dev/server/fedora/specs/openafs-systemd.spec.patch (revision 2081) +++ branches/fc17-dev/server/fedora/specs/openafs-systemd.spec.patch (revision 2195) @@ -1,14 +1,15 @@ ---- 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 +--- openafs.spec.orig 2011-12-11 04:48:08.257676312 -0500 ++++ openafs.spec 2011-12-11 04:49:43.101175888 -0500 +@@ -225,6 +225,9 @@ 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 + BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison ++%if 0%{?fedora} >= 15 ++BuildRequires: systemd-units ++%endif %if 0%{?fedora} BuildRequires: perl-devel perl-ExtUtils-Embed %endif -@@ -323,6 +323,12 @@ +@@ -326,6 +329,12 @@ %package client Provides: scripts-openafs-client @@ -23,5 +24,5 @@ %if %{fedorakmod} Requires: %{name}-kmod >= %{version} -@@ -347,6 +353,12 @@ +@@ -350,6 +359,12 @@ Requires: openafs = %{version} Summary: OpenAFS Filesystem Server @@ -36,5 +37,5 @@ %description server The AFS distributed filesystem. AFS is a distributed filesystem -@@ -999,7 +1011,12 @@ +@@ -1005,7 +1020,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_libdir} @@ -49,5 +50,5 @@ mkdir -p $RPM_BUILD_ROOT%{pamdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/afs/etc -@@ -1029,8 +1046,14 @@ +@@ -1035,8 +1055,14 @@ # Copy root.client config files @@ -64,5 +65,5 @@ # Copy PAM modules install -m 755 ${sysname}/dest/lib/pam* $RPM_BUILD_ROOT%{pamdir} -@@ -1310,7 +1333,14 @@ +@@ -1318,7 +1344,14 @@ fi @@ -79,5 +80,5 @@ mkdir /afs chown root.root /afs -@@ -1327,10 +1357,17 @@ +@@ -1335,10 +1368,17 @@ %post server @@ -97,5 +98,5 @@ %if %{build_authlibs} %post authlibs -@@ -1346,16 +1383,45 @@ +@@ -1354,16 +1394,39 @@ fi @@ -127,24 +128,19 @@ +%endif + ++%if 0%{?fedora} >= 15 +%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 ++%endif %if %{build_dkmspkg} %post -n dkms-%{name} -@@ -1413,6 +1479,32 @@ +@@ -1421,6 +1484,26 @@ %endif %endif ++%if 0%{?fedora} >= 15 +%triggerun -- openafs-client < 1.6.0-1 +# Save the current service runlevel info @@ -153,10 +149,6 @@ +/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 ++# Run this because the SysV package being removed won't do it +/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 @@ -166,15 +158,12 @@ +/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 ++# Run this because the SysV package being removed won't do it +/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || : -+/bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : ++%endif + ############################################################################## ### ### file lists -@@ -1450,7 +1542,12 @@ +@@ -1458,7 +1541,12 @@ %{pamdir}/pam_afs.krb.so %{pamdir}/pam_afs.so.1 @@ -189,5 +178,5 @@ %{_mandir}/man1/copyauth.* %{_mandir}/man1/up.* -@@ -1498,7 +1595,11 @@ +@@ -1506,7 +1594,11 @@ %{_sbindir}/vldb_check %{_sbindir}/vldb_convert Index: branches/fc17-dev/server/fedora/specs/openafs.spec.patch =================================================================== --- branches/fc17-dev/server/fedora/specs/openafs.spec.patch (revision 2081) +++ branches/fc17-dev/server/fedora/specs/openafs.spec.patch (revision 2195) @@ -1,4 +1,4 @@ ---- rpmbuild/SPECS/openafs.spec -+++ rpmbuild/SPECS/openafs.spec.~3~ 2011-11-20 20:13:52.211673609 -0500 +--- openafs.spec 2012-02-13 15:41:02.757592190 -0500 ++++ openafs.spec.~3~ 2012-02-13 15:48:25.366294629 -0500 @@ -4,7 +4,7 @@ %define pkgvers 1.6.0 @@ -10,20 +10,21 @@ %{!?fedorakmod: %define fedorakmod 1} %{!?build_dkmspkg: %define build_dkmspkg 1} -@@ -237,6 +237,14 @@ +@@ -237,6 +237,15 @@ ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 +Patch1000: openafs-scripts.patch -+Patch1001: openafs-localcsdb.patch -+Patch1002: openafs-systemd.patch -+Patch1003: openafs-systemd-crond.patch ++Patch1001: openafs-systemd.patch ++Patch1002: openafs-systemd-crond.patch ++Patch1003: openafs-systemd-csdb.patch +Patch1004: openafs-linux-3.1-rcu.patch +Patch1005: openafs-linux-3.1-fsync.patch +Patch1006: openafs-linux-3.1-zalloc.patch ++Patch1007: openafs-linux-3.2-nlink.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 -@@ -316,6 +324,7 @@ +@@ -316,6 +325,7 @@ %if %{build_userspace} @@ -33,5 +34,5 @@ %if %{fedorakmod} -@@ -376,6 +385,7 @@ +@@ -376,6 +386,7 @@ %if %{build_authlibs} @@ -41,5 +42,5 @@ Group: Networking/Filesystems -@@ -392,6 +402,7 @@ +@@ -392,6 +403,7 @@ %endif @@ -49,5 +50,5 @@ Requires: openafs-authlibs = %{version}-%{release} %endif -@@ -410,6 +421,7 @@ +@@ -410,6 +422,7 @@ libraries. @@ -57,5 +58,5 @@ Group: Development/Filesystems Requires: openafs = %{version}-%{release} -@@ -439,6 +451,7 @@ +@@ -439,6 +452,7 @@ administrators. @@ -65,5 +66,5 @@ Group: Networking/Filesystems Provides: openafs-kernel = %{version} -@@ -488,6 +501,7 @@ +@@ -488,6 +502,7 @@ %if %{krb5support} @@ -73,5 +74,5 @@ Requires: openafs = %{version} Group: Networking/Filesystems -@@ -514,7 +528,7 @@ +@@ -514,7 +529,7 @@ %if %{build_modules} @@ -82,5 +83,5 @@ %else -@@ -671,6 +685,15 @@ +@@ -671,6 +686,16 @@ #%setup -q -n %{srcdir} %setup -q -b 1 -n %{srcdir} @@ -88,15 +89,16 @@ +# Apply the Scripts patch +%patch1000 -p1 -b .scripts -+%patch1001 -p1 -b .localcsdb -+%patch1002 -p1 -b .systemd -+%patch1003 -p1 -b .systemd-crond ++%patch1001 -p1 -b .systemd ++%patch1002 -p1 -b .systemd-crond ++%patch1003 -p1 -b .systemd-csdb +%patch1004 -p1 -b .rcu +%patch1005 -p1 -b .fsync +%patch1006 -p1 -b .zalloc ++%patch1007 -p1 -b .nlink + ############################################################################## # # building -@@ -1212,6 +1235,13 @@ +@@ -1212,6 +1237,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* Index: branches/fc17-dev/server/fedora/specs/openssh.spec.patch =================================================================== --- branches/fc17-dev/server/fedora/specs/openssh.spec.patch (revision 2081) +++ branches/fc17-dev/server/fedora/specs/openssh.spec.patch (revision 2195) @@ -1,10 +1,10 @@ ---- openssh.spec.orig 2010-05-31 06:20:02.000000000 -0400 -+++ openssh.spec 2010-09-06 21:53:21.000000000 -0400 +--- openssh.spec.~1~ 2012-02-14 11:06:13.000000000 -0500 ++++ openssh.spec 2012-02-25 13:02:28.660616538 -0500 @@ -78,7 +78,7 @@ Summary: An open source implementation of SSH protocol versions 1 and 2 Name: openssh Version: %{openssh_ver} --Release: %{openssh_rel}%{?dist}%{?rescue_rel}.1 -+Release: %{openssh_rel}%{?dist}%{?rescue_rel}.1.scripts.%{scriptsversion} +-Release: %{openssh_rel}%{?dist}%{?rescue_rel} ++Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion} URL: http://www.openssh.com/portable.html #URL1: http://pamsshagentauth.sourceforge.net @@ -15,8 +15,8 @@ Source5: pam_ssh_agent-rmheaders +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch - + Patch100: openssh-5.6p1-wIm.patch Patch0: openssh-5.6p1-redhat.patch -@@ -207,6 +209,7 @@ +@@ -214,6 +215,7 @@ Requires(pre): /usr/sbin/useradd Requires: pam >= 1.0.1-3 @@ -26,7 +26,7 @@ %if %{ldap} %package ldap -@@ -323,6 +326,8 @@ - %patch80 -p1 -b .biguid - %patch81 -p1 -b .clientloop +@@ -333,6 +335,8 @@ + %patch83 -p0 -b .oomkiller + %patch84 -p1 -b .legacy +%patch1001 -p1 -b .gssapi-env @@ -35,3 +35,2 @@ pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} autoreconf - Index: branches/fc17-dev/server/fedora/specs/php.spec.patch =================================================================== --- branches/fc17-dev/server/fedora/specs/php.spec.patch (revision 2195) +++ branches/fc17-dev/server/fedora/specs/php.spec.patch (revision 2195) @@ -0,0 +1,30 @@ +--- php.spec.~1~ 2012-02-02 17:13:59.000000000 -0500 ++++ php.spec 2012-05-03 14:18:22.234721036 -0400 +@@ -37,7 +37,7 @@ + Summary: PHP scripting language for creating dynamic web sites + Name: php + Version: 5.3.10 +-Release: 1%{?dist} ++Release: 1%{?dist}.scripts.%{scriptsversion} + License: PHP + Group: Development/Languages + URL: http://www.php.net/ +@@ -76,6 +76,9 @@ + # Fixes for tests + Patch61: php-5.0.4-tests-wddx.patch + ++Provides: scripts-php ++Patch100: php-cve-2012-1823.patch ++ + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel +@@ -544,6 +547,8 @@ + + %patch61 -p1 -b .tests-wddx + ++%patch100 -p0 -b .cve-2012-1823 ++ + # Prevent %%doc confusion over LICENSE files + cp Zend/LICENSE Zend/ZEND_LICENSE + cp TSRM/LICENSE TSRM_LICENSE Index: branches/fc17-dev/server/fedora/specs/python-afs.spec =================================================================== --- branches/fc17-dev/server/fedora/specs/python-afs.spec (revision 2195) +++ branches/fc17-dev/server/fedora/specs/python-afs.spec (revision 2195) @@ -0,0 +1,49 @@ +Name: python-afs +Version: 0.1.1 +%define commit_hash dceee3da +%define tag_hash fb29c26 +Release: 0.%{scriptsversion}%{?dist} +Summary: Python access to AFS library + +Group: Development/Languages +License: GPL +URL: http://github.com/ebroder/pyafs +Source0: http://github.com/ebroder/pyafs/tarball/%{version}/ebroder-%{name}-%{version}-0-g%{commit_hash}.tar.gz +Patch1: https://github.com/ebroder/pyafs/commit/94a09d55edd7d3c1b53424ee1a39245db751c5e9.patch +Patch2: https://github.com/ebroder/pyafs/commit/d6425bd9fa52034a2a62ed95c8fec8cbcfd2707d.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: python-devel, python-setuptools, Cython, openafs-devel, openafs-authlibs-devel, krb5-devel + +%description +Get at AFS from Python. + + +%prep +%setup -q -n ebroder-pyafs-%{tag_hash} +%patch1 -p1 +%patch2 -p1 + + +%build +CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="-I%{_includedir}/et" %{__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,-) +%{python_sitearch}/* + + +%changelog +* Thu Dec 15 2011 Alex Dehnert - 0.1.1 +- Initial RPM release + Index: branches/fc17-dev/server/fedora/specs/rubygems.spec.patch =================================================================== --- branches/fc17-dev/server/fedora/specs/rubygems.spec.patch (revision 2081) +++ branches/fc17-dev/server/fedora/specs/rubygems.spec.patch (revision 2195) @@ -1,16 +1,16 @@ ---- rubygems.spec.orig 2011-11-04 14:16:37.000000000 -0400 -+++ rubygems.spec 2011-11-04 14:32:02.000000000 -0400 +--- rubygems.spec.~1~ 2012-04-20 14:46:27.000000000 -0400 ++++ rubygems.spec 2012-05-03 14:12:52.421863447 -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} +-Release: 5%{?dist} ++Release: 5%{?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 +@@ -42,6 +42,9 @@ + # Insecure connection to SSL repository fix + Patch10: rubygems-1.x.x-ssl-connection-don_t-revert.patch +Provides: scripts-rubygems = %{version}-%{release} @@ -20,7 +20,7 @@ Requires: ruby >= 1.8.7 Requires: ruby-rdoc -@@ -69,6 +72,8 @@ - %patch6 -p1 -b .esc +@@ -83,6 +86,8 @@ %patch7 -p1 -b .esc.skip + %patch10 -p1 -b .ssl +%patch1000 -p1 -b .thread Index: branches/fc17-dev/server/fedora/specs/scripts-base.spec =================================================================== --- branches/fc17-dev/server/fedora/specs/scripts-base.spec (revision 2081) +++ branches/fc17-dev/server/fedora/specs/scripts-base.spec (revision 2195) @@ -27,4 +27,5 @@ Requires: whoisd Requires: logview +Requires: fuse-better-mousetrapfs Requires: %{all_archs nss-pam-ldapd} Requires: php_scripts Index: branches/fc17-dev/server/fedora/specs/scripts-static-cat.spec =================================================================== --- branches/fc17-dev/server/fedora/specs/scripts-static-cat.spec (revision 2081) +++ branches/fc17-dev/server/fedora/specs/scripts-static-cat.spec (revision 2195) @@ -2,4 +2,7 @@ # - https://fedoraproject.org/wiki/Packaging:Haskell # - https://fedoraproject.org/wiki/PackagingDrafts/Haskell + +# Link Haskell libs statically for 3x faster startup speed. +%define ghc_without_dynamic 1 Name: scripts-static-cat