Index: trunk/server/fedora/specs/accountadm.spec =================================================================== --- trunk/server/fedora/specs/accountadm.spec (revision 2561) +++ trunk/server/fedora/specs/accountadm.spec (revision 2591) @@ -10,9 +10,9 @@ BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root BuildRequires: scripts-openafs-devel, scripts-openafs-authlibs-devel -BuildRequires: hesinfo +BuildRequires: hesiod BuildRequires: openldap-clients BuildRequires: krb5-devel BuildRequires: sudo -Requires: hesinfo +Requires: hesiod Requires: openldap-clients Requires: sudo Index: trunk/server/fedora/specs/discuss.spec =================================================================== --- trunk/server/fedora/specs/discuss.spec (revision 2561) +++ trunk/server/fedora/specs/discuss.spec (revision 2591) @@ -1,5 +1,5 @@ # Make sure to update this to coincide with the most recent debathena-discuss # release from http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/ -%define upstreamversion 10.0.15 +%define upstreamversion 10.0.17 Name: discuss Version: %{upstreamversion} @@ -21,5 +21,5 @@ %prep -%setup -q -n debathena-%{name}-%{upstreamversion} +%setup -q -n %{name}-%{upstreamversion} %build @@ -30,5 +30,6 @@ automake --add-missing --foreign || : %configure --without-krb4 --with-krb5 --with-zephyr --with-pager=/usr/bin/less -make %{?_smp_mflags} +#make %{?_smp_mflags} +make %install @@ -56,5 +57,4 @@ %{_bindir}/dspipe %{_bindir}/mkds -%{_bindir}/pmtg %{_bindir}/rmds %{_libexecdir}/edsc @@ -99,4 +99,7 @@ %attr(755,discuss,discuss) %{_localstatedir}/spool/discuss %attr(644,root,root) %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} +%{_libexecdir}/disdebug +%{_libexecdir}/expunge +%{_libexecdir}/recover %pre server @@ -108,4 +111,7 @@ %changelog +* Mon May 26 2014 Alexander Chernyakhovsky - 10.0.17-1 +- Update to discuss 10.0.17 + * Tue Mar 19 2013 Alexander Chernyakhovsky - 10.0.15-1 - Update to discuss 10.0.15 Index: trunk/server/fedora/specs/ghc-cgi.spec =================================================================== --- trunk/server/fedora/specs/ghc-cgi.spec (revision 2561) +++ trunk/server/fedora/specs/ghc-cgi.spec (revision 2591) @@ -1,34 +1,43 @@ -# cabal2spec-0.25 +# Generated with cabal-rpm # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name cgi -%global common_summary Haskell %{pkg_name} library +Name: ghc-%{pkg_name} +Version: 3001.1.8.5 +Release: 0.%{scriptsversion}%{?dist} +Summary: A library for writing CGI programs -%global common_description A %{pkg_name} library for Haskell. - -Name: ghc-%{pkg_name} -Version: 3001.1.8.2 -Release: 0.%{scriptsversion}%{?dist} -Summary: %{common_summary} - -Group: System Environment/Libraries License: BSD -# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches} + BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec -BuildRequires: ghc-network-prof -BuildRequires: ghc-parsec-prof -BuildRequires: ghc-mtl-prof -BuildRequires: ghc-MonadCatchIO-mtl-prof -BuildRequires: ghc-xhtml-prof +# Begin cabal-rpm deps: +BuildRequires: ghc-MonadCatchIO-mtl-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-network-devel +BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-old-time-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-xhtml-devel +# End cabal-rpm deps %description -%{common_description} +This is a Haskell library for writing CGI programs. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. @@ -45,17 +54,23 @@ -# devel subpackage -%ghc_devel_package - -%ghc_devel_description +%post devel +%ghc_pkg_recache -%ghc_devel_post_postun +%postun devel +%ghc_pkg_recache -%ghc_files LICENSE +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files %changelog +* Mon May 26 2014 Alexander Chernyakhovsky - 3001.1.8.5-0 +- Updated packaging for F20, with cabal-rpm + * Fri May 25 2012 Anders Kaseorg - 3001.1.8.2-0 - regenerated packaging with cabal2spec-0.25.5 Index: trunk/server/fedora/specs/ghc-unix-handle.spec =================================================================== --- trunk/server/fedora/specs/ghc-unix-handle.spec (revision 2561) +++ trunk/server/fedora/specs/ghc-unix-handle.spec (revision 2591) @@ -1,29 +1,38 @@ -# cabal2spec-0.25 # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name unix-handle - -%global common_summary Haskell %{pkg_name} library - -%global common_description A %{pkg_name} library for Haskell. Name: ghc-%{pkg_name} Version: 0.0.0 Release: 0.%{scriptsversion}%{?dist} -Summary: %{common_summary} +Summary: POSIX operations on Handles -Group: System Environment/Libraries License: BSD -# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches} + BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec +# Begin cabal-rpm deps: +BuildRequires: ghc-unix-devel +# End cabal-rpm deps %description -%{common_description} +This package provides versions of functions from "System.Posix.Files" that +operate on 'System.IO.Handle' instead of 'System.IO.FilePath' or +'System.Posix.Fd'. This is useful to prevent race conditions that may arise +from looking up the same path twice. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. @@ -40,17 +49,23 @@ -# devel subpackage -%ghc_devel_package - -%ghc_devel_description +%post devel +%ghc_pkg_recache -%ghc_devel_post_postun +%postun devel +%ghc_pkg_recache -%ghc_files LICENSE +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files %changelog +* Mon May 26 2014 Alex Chernyakhovsky - 0.0.0-0 +- Updated packaging for F20 with cabal-rpm + * Fri May 25 2012 Anders Kaseorg - 0.0.0-0 - regenerated packaging with cabal2spec-0.25.5 Index: trunk/server/fedora/specs/gnutls.spec.patch =================================================================== --- trunk/server/fedora/specs/gnutls.spec.patch (revision 2561) +++ (revision ) @@ -1,28 +1,0 @@ ---- gnutls.spec.orig 2014-03-08 16:13:24.922925743 -0500 -+++ gnutls.spec 2014-03-08 16:14:50.464231133 -0500 -@@ -1,7 +1,7 @@ - Summary: A TLS protocol implementation - Name: gnutls - Version: 2.12.23 --Release: 2%{?dist} -+Release: 2%{?dist}.scripts.%{scriptsversion} - # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ - License: GPLv3+ and LGPLv2+ - Group: System Environment/Libraries -@@ -26,6 +26,8 @@ - # Use only FIPS approved ciphers in the FIPS mode - Patch7: gnutls-2.12.21-fips-algorithms.patch - Patch8: gnutls-2.12.23-cve-2013-2116.patch -+# Patch GNUTLS-SA-2014-2 -+Patch9: gnutls-2.12.x-cve-2014-0092.patch - - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - Requires: libgcrypt >= 1.2.2 -@@ -99,6 +101,7 @@ - %patch6 -p1 -b .cli-debug - %patch7 -p1 -b .fips - %patch8 -p1 -b .overread -+%patch9 -p1 -b .cve-2014-0092 - - for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do - touch lib/$i Index: trunk/server/fedora/specs/httpd.spec.patch =================================================================== --- trunk/server/fedora/specs/httpd.spec.patch (revision 2561) +++ trunk/server/fedora/specs/httpd.spec.patch (revision 2591) @@ -1,8 +1,8 @@ ---- /tmp/httpd/httpd.spec.orig 2013-02-14 17:53:29.967176396 -0500 -+++ /tmp/httpd/httpd.spec 2013-02-14 17:54:57.172521444 -0500 -@@ -9,7 +9,7 @@ +--- rpmbuild/SPECS/httpd.spec.~1~ 2014-07-23 06:24:15.000000000 -0400 ++++ httpd.spec 2014-08-26 21:10:34.994027237 -0400 +@@ -15,7 +15,7 @@ Summary: Apache HTTP Server Name: httpd - Version: 2.2.23 + Version: 2.4.10 -Release: 1%{?dist} +Release: 1%{?dist}.scripts.%{scriptsversion} @@ -10,21 +10,27 @@ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html -@@ -57,6 +57,15 @@ - Requires(postun): systemd-units - Requires(post): systemd-units - +@@ -65,6 +65,13 @@ + # Bug fixes + Patch55: httpd-2.4.4-malformed-host.patch + Patch56: httpd-2.4.4-mod_unique_id.patch ++ ++Patch1001: httpd-suexec-scripts.patch ++Patch1002: httpd-mod_status-security.patch ++Patch1003: httpd-304s.patch ++Patch1004: httpd-fixup-vhost.patch ++Patch1005: httpd-allow-null-user.patch ++ + License: ASL 2.0 + Group: System Environment/Daemons + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +@@ -77,6 +84,7 @@ + Provides: webserver + Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release} + Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{oldmmnisa} +Provides: scripts-httpd = %{version}-%{release} -+Patch1000: httpd-suexec-scripts.patch -+Patch1003: httpd-2.2.x-mod_status-security.patch -+Patch1004: httpd-2.2.x-304.patch -+Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch -+Patch1006: httpd-suexec-cloexec.patch -+Patch1007: httpd-fixup-vhost.patch -+Patch1008: httpd-SSLCompression.patch -+ - %description - The Apache HTTP Server is a powerful, efficient, and extensible - web server. -@@ -67,6 +76,7 @@ + Requires: httpd-tools = %{version}-%{release} + Requires(pre): /usr/sbin/useradd + Requires(preun): systemd-units +@@ -94,6 +102,7 @@ Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel Requires: apr-devel, apr-util-devel, pkgconfig @@ -34,5 +40,5 @@ %description devel The httpd-devel package contains the APXS binary and other files -@@ -105,6 +115,7 @@ +@@ -132,6 +141,7 @@ Requires(post): openssl, /bin/cat Requires(pre): httpd @@ -42,28 +48,29 @@ %description -n mod_ssl -@@ -131,6 +142,14 @@ - # Patch in vendor/release string - sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 +@@ -190,6 +200,12 @@ + %patch55 -p1 -b .malformedhost + %patch56 -p1 -b .uniqueid -+%patch1000 -p1 -b .scripts -+%patch1003 -p1 -b .permitstatus -+%patch1004 -p1 -b .scripts-304 -+%patch1005 -p1 -b .ssl-sessioncache -+%patch1006 -p1 -b .cloexec -+%patch1007 -p1 -b .fixup-vhost -+%patch1008 -p1 -b .sslcompression ++%patch1001 -p1 -b .suexec-scripts ++%patch1002 -p1 -b .mod_status-security ++%patch1003 -p1 -b .scripts-304s ++%patch1004 -p1 -b .fixup-vhost ++%patch1005 -p1 -b .allow-null-user + - # 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 -@@ -191,10 +210,12 @@ - --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ + # Patch in the vendor string + sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h + +@@ -242,11 +258,13 @@ --enable-suexec --with-suexec \ + --enable-suexec-capabilities \ --with-suexec-caller=%{suexec_caller} \ -- --with-suexec-docroot=%{contentdir} \ +- --with-suexec-docroot=%{docroot} \ +- --without-suexec-logfile \ +- --with-suexec-syslog \ + --with-suexec-docroot=/ \ + --with-suexec-userdir=web_scripts \ + --with-suexec-trusteddir=/usr/libexec/scripts-trusted \ - --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ ++ --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ ++ --without-suexec-syslog \ --with-suexec-bin=%{_sbindir}/suexec \ - --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ @@ -71,3 +78,22 @@ --enable-pie \ --with-pcre \ - $* + --enable-mods-shared=all \ +@@ -542,7 +560,8 @@ + %{_sbindir}/fcgistarter + %{_sbindir}/apachectl + %{_sbindir}/rotatelogs +-%caps(cap_setuid,cap_setgid+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec ++# cap_dac_override needed to write to /var/log/httpd ++%caps(cap_setuid,cap_setgid,cap_dac_override+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec + + %dir %{_libdir}/httpd + %dir %{_libdir}/httpd/modules +@@ -1014,3 +1033,8 @@ + * Sun Apr 04 2010 Robert Scheck - 2.2.15-1 + - update to 2.2.15 (#572404, #579311) + ++Patch1001: httpd-suexec-scripts.patch ++Patch1002: httpd-mod_status-security.patch ++Patch1003: httpd-304s.patch ++Patch1004: httpd-fixup-vhost.patch ++Patch1005: httpd-allow-null-user.patch Index: trunk/server/fedora/specs/kernel.spec.patch =================================================================== --- trunk/server/fedora/specs/kernel.spec.patch (revision 2561) +++ (revision ) @@ -1,36 +1,0 @@ ---- kernel.spec.orig 2014-05-13 21:12:04.076585365 -0400 -+++ kernel.spec 2014-05-13 21:16:17.885587650 -0400 -@@ -783,6 +783,16 @@ - #rhbz 976837 - Patch25065: fix-ext4-overflows.patch - -+# CVE-2014-0196 (FEDORA-2014-6122) -+Patch30000: cve-2014-0196.patch -+ -+# CVE-2014-3153 -+Patch30001: cve-2014-3153-0.patch -+Patch30002: cve-2014-3153-1.patch -+Patch30003: cve-2014-3153-2.patch -+Patch30004: cve-2014-3153-3.patch -+Patch30005: cve-2014-3153-4.patch -+ - # END OF PATCH DEFINITIONS - - %endif -@@ -1516,6 +1519,16 @@ - #rhbz 976837 - ApplyPatch fix-ext4-overflows.patch - -+# CVE-2014-0196 (FEDORA-2014-6122) -+ApplyPatch cve-2014-0196.patch -+ -+# CVE-2014-3153 -+ApplyPatch cve-2014-3153-0.patch -+ApplyPatch cve-2014-3153-1.patch -+ApplyPatch cve-2014-3153-2.patch -+ApplyPatch cve-2014-3153-3.patch -+ApplyPatch cve-2014-3153-4.patch -+ - # END OF PATCH APPLICATIONS - - %endif Index: trunk/server/fedora/specs/krb5.spec.patch =================================================================== --- trunk/server/fedora/specs/krb5.spec.patch (revision 2561) +++ trunk/server/fedora/specs/krb5.spec.patch (revision 2591) @@ -1,16 +1,16 @@ ---- krb5.spec.orig 2013-05-23 18:04:40.738088099 -0400 -+++ krb5.spec 2013-05-23 18:08:02.592147349 -0400 -@@ -20,7 +20,7 @@ +--- krb5.spec.orig 2014-05-25 19:01:13.701141912 -0400 ++++ krb5.spec 2014-05-25 19:02:11.438816630 -0400 +@@ -41,7 +41,7 @@ Summary: The Kerberos network authentication system Name: krb5 - Version: 1.10.2 --Release: 12%{?dist} -+Release: 12%{?dist}.scripts.%{scriptsversion} + Version: 1.11.5 +-Release: 11%{?dist} ++Release: 11%{?dist}.scripts.%{scriptsversion} # Maybe we should explode from the now-available-to-everybody tarball instead? - # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.2-signed.tar + # http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.5-signed.tar Source0: krb5-%{version}.tar.gz -@@ -77,6 +77,8 @@ - Patch113: krb5-fast-msg_type.patch - Patch114: krb5-1.11.2-kpasswd_pingpong.patch +@@ -143,6 +143,8 @@ + Patch405: 0005-Be-more-careful-of-target-ccache-collections.patch + Patch406: 0006-Copy-config-entries-to-the-target-ccache.patch +Patch1000: krb5-kuserok-scripts.patch @@ -19,18 +19,19 @@ URL: http://web.mit.edu/kerberos/www/ Group: System Environment/Libraries -@@ -134,6 +136,7 @@ +@@ -232,6 +234,7 @@ %package libs Summary: The shared libraries used by Kerberos 5 Group: System Environment/Libraries +Provides: scripts-krb5-libs, scripts-krb5-libs%{?_isa} + %if 0%{?rhel} == 6 + # Some of the older libsmbclient builds here incorrectly called + # krb5_locate_kdc(), which was mistakenly exported in 1.9. +@@ -410,6 +413,8 @@ + %patch203 -p1 -b .otp2 + %patch204 -p1 -b .move-otp-sockets - %description libs - Kerberos is a network authentication system. The krb5-libs package -@@ -261,6 +264,7 @@ - %patch112 -p1 -b .CVE-2013-1416 - %patch113 -p1 -b .fast-msg_type - %patch114 -p1 -b .kpasswd_pingpong +%patch1000 -p1 -b .kuserok - rm src/lib/krb5/krb/deltat.c ++ + # Take the execute bit off of documentation. + chmod -x doc/krb5-protocol/*.txt - gzip doc/*.ps Index: trunk/server/fedora/specs/openafs.spec.patch =================================================================== --- trunk/server/fedora/specs/openafs.spec.patch (revision 2561) +++ trunk/server/fedora/specs/openafs.spec.patch (revision 2591) @@ -1,6 +1,6 @@ ---- openafs.spec.orig 2013-06-24 04:40:31.000000000 -0400 -+++ openafs.spec 2013-07-18 22:43:10.631044261 -0400 +--- openafs.spec.orig 2014-05-25 21:15:54.539027644 -0400 ++++ openafs.spec 2014-05-25 21:16:27.836268275 -0400 @@ -4,7 +4,7 @@ - %define pkgvers 1.6.4 + %define pkgvers 1.6.8 # for beta/rc releases make pkgrel 0. # for real releases make pkgrel 1 (or more for extra releases) @@ -10,5 +10,5 @@ %{!?fedorakmod: %define fedorakmod 1} %{!?build_dkmspkg: %define build_dkmspkg 1} -@@ -249,9 +249,16 @@ +@@ -249,9 +249,15 @@ %if %{build_modules} BuildRequires: kernel-devel @@ -21,5 +21,4 @@ +Patch1002: openafs-systemd-crond.patch +Patch1003: openafs-systemd-csdb.patch -+Patch1004: openafs-d_drop.patch +%define _default_patch_fuzz 2 + @@ -33,5 +32,5 @@ +Provides: scripts-openafs-client Requires: binutils, openafs = %{version} - %if 0%{?fedora} >= 15 + %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 Requires: systemd-units @@ -382,6 +389,7 @@ @@ -92,5 +91,5 @@ %else -@@ -698,6 +711,12 @@ +@@ -698,6 +711,11 @@ #%setup -q -n %{srcdir} %setup -q -b 1 -n %{srcdir} @@ -100,10 +99,9 @@ +%patch1002 -p1 -b .systemd-crond +%patch1003 -p1 -b .systemd-csdb -+%patch1004 -p1 -b .d_drop + ############################################################################## # # building -@@ -869,6 +887,8 @@ +@@ -871,6 +889,8 @@ %endif %endif @@ -114,5 +112,5 @@ --prefix=%{_prefix} \ --libdir=%{_libdir} \ -@@ -1257,6 +1277,13 @@ +@@ -1267,6 +1287,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* Index: trunk/server/fedora/specs/openssh.spec.patch =================================================================== --- trunk/server/fedora/specs/openssh.spec.patch (revision 2561) +++ trunk/server/fedora/specs/openssh.spec.patch (revision 2591) @@ -1,5 +1,5 @@ ---- openssh.spec.orig 2013-07-15 21:14:52.452894092 -0400 -+++ openssh.spec 2013-07-15 21:18:59.494168115 -0400 -@@ -74,7 +74,7 @@ +--- openssh.spec.orig 2014-05-25 19:03:45.308703615 -0400 ++++ openssh.spec 2014-05-25 19:05:57.593843283 -0400 +@@ -71,7 +71,7 @@ Summary: An open source implementation of SSH protocol versions 1 and 2 Name: openssh @@ -9,24 +9,23 @@ 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 -@@ -220,7 +220,7 @@ - Patch904: openssh-5.9p1-change-max-startups.patch - # make sftp's libedit interface marginally multibyte aware (#841771) - Patch908: openssh-5.9p1-sftp-multibyte.patch -- + Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz +@@ -196,6 +196,7 @@ + # ignore environment variables with embedded '=' or '\0' characters (#1077843) + Patch909: openssh-6.4p1-ignore-bad-env-var.patch + +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch License: BSD Group: Applications/Internet -@@ -271,6 +273,7 @@ - Group: Applications/Internet - Requires: openssh = %{version}-%{release} +@@ -254,6 +255,7 @@ + Requires(pre): /usr/sbin/useradd + Requires: pam >= 1.0.1-3 Requires: fipscheck-lib%{_isa} >= 1.3.0 +Provides: scripts-openssh-server - - %package server - Summary: An open source SSH server daemon -@@ -458,10 +461,12 @@ - %patch714 -p0 -b .null-xcrypt + Requires(post): systemd-units + Requires(preun): systemd-units + Requires(postun): systemd-units +@@ -411,10 +413,12 @@ + %patch713 -p1 -b .ctr-cavs %patch800 -p1 -b .gsskex @@ -39,8 +38,8 @@ +# Remove the kuserok patch as it won't apply without patch800 +# %patch901 -p1 -b .kuserok - %patch902 -p1 -b .man-moduli - %patch903 -p1 -b .ipqos - %patch904 -p1 -b .max-startups -@@ -471,6 +476,8 @@ + %patch902 -p1 -b .ccache_name + %patch903 -p1 -b .dh + %patch904 -p1 -b .SP800-131A +@@ -428,6 +432,8 @@ # Nothing here yet %endif Index: trunk/server/fedora/specs/openssl.spec.patch =================================================================== --- trunk/server/fedora/specs/openssl.spec.patch (revision 2561) +++ (revision ) @@ -1,84 +1,0 @@ ---- openssl.spec.orig 2013-02-19 16:06:27.000000000 -0500 -+++ openssl.spec 2014-08-06 20:57:41.043801219 -0400 -@@ -20,13 +20,13 @@ - - Summary: A general purpose cryptography library with TLS implementation - Name: openssl --Version: 1.0.0k --Release: 1%{?dist} -+Version: 1.0.0n -+Release: 0%{?dist}.scripts.%{scriptsversion} - Epoch: 1 - # We have to remove certain patented algorithms from the openssl source - # tarball with the hobble-openssl script which is included below. - # The original openssl upstream tarball cannot be shipped in the .src.rpm. --Source: openssl-%{version}-usa.tar.xz -+Source: https://www.openssl.org/source/openssl-%{version}.tar.gz - Source1: hobble-openssl - Source2: Makefile.certificate - Source6: make-dummy-cert -@@ -44,23 +44,22 @@ - Patch7: openssl-1.0.0-timezone.patch - # Bug fixes - Patch23: openssl-1.0.0-beta4-default-paths.patch --Patch25: openssl-1.0.0a-manfix.patch - # Functionality changes - Patch32: openssl-0.9.8g-ia64.patch - Patch33: openssl-1.0.0-beta4-ca-dir.patch - Patch34: openssl-0.9.6-x509.patch - Patch35: openssl-0.9.8j-version-add-engines.patch --Patch38: openssl-1.0.0-beta5-cipher-change.patch --Patch39: openssl-1.0.0b-ipv6-apps.patch --Patch40: openssl-1.0.0k-fips.patch -+Patch38: openssl-1.0.0n-cipher-change.patch -+Patch39: openssl-1.0.0n-ipv6-apps.patch -+Patch40: openssl-1.0.0n-fips.patch - Patch41: openssl-1.0.0-beta3-fipscheck.patch - Patch43: openssl-1.0.0a-fipsmode.patch - Patch44: openssl-1.0.0-beta3-fipsrng.patch - Patch45: openssl-1.0.1e-env-zlib.patch - Patch47: openssl-1.0.0-beta5-readme-warning.patch --Patch49: openssl-1.0.1a-algo-doc.patch -+Patch49: openssl-1.0.0n-algo-doc.patch - Patch50: openssl-1.0.0-beta4-dtls1-abi.patch --Patch51: openssl-1.0.0k-version.patch -+Patch51: openssl-1.0.0n-version.patch - Patch52: openssl-1.0.0b-aesni.patch - Patch53: openssl-1.0.0-name-hash.patch - Patch54: openssl-1.0.0c-speed-fips.patch -@@ -73,13 +72,11 @@ - Patch61: openssl-1.0.0d-cavs.patch - Patch62: openssl-1.0.0-fips-aesni.patch - Patch63: openssl-1.0.0d-xmpp-starttls.patch --Patch64: openssl-1.0.0k-intelopts.patch - Patch65: openssl-1.0.0e-chil-fixes.patch - Patch66: openssl-1.0.0-sha2test.patch - Patch67: openssl-1.0.0k-secure-getenv.patch - # Backported fixes including security fixes - Patch81: openssl-1.0.0d-padlock64.patch --Patch82: openssl-1.0.0k-backports.patch - - License: OpenSSL - Group: System Environment/Libraries -@@ -143,7 +140,6 @@ - %patch7 -p1 -b .timezone - - %patch23 -p1 -b .default-paths --%patch25 -p1 -b .manfix - - %patch32 -p1 -b .ia64 - %patch33 -p1 -b .ca-dir -@@ -172,13 +168,11 @@ - %patch61 -p1 -b .cavs - %patch62 -p1 -b .fips-aesni - %patch63 -p1 -b .starttls --%patch64 -p1 -b .intelopts - %patch65 -p1 -b .chil - %patch66 -p1 -b .sha2test - %patch67 -p1 -b .secure-getenv - - %patch81 -p1 -b .padlock64 --%patch82 -p1 -b .backports - - # Modify the various perl scripts to reference perl in the right location. - perl util/perlpath.pl `dirname %{__perl}` Index: trunk/server/fedora/specs/python-authkit.spec =================================================================== --- trunk/server/fedora/specs/python-authkit.spec (revision 2591) +++ trunk/server/fedora/specs/python-authkit.spec (revision 2591) @@ -0,0 +1,67 @@ +# sitelib for noarch packages, sitearch for others (remove the unneeded one) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} + +Name: python-authkit +Version: 0.4.5 +Release: 2%{?dist} +Summary: An authentication and authorization toolkit for WSGI applications and frameworks + +License: MIT +URL: https://pypi.python.org/pypi/AuthKit/0.4.5 +Source0: https://pypi.python.org/packages/source/A/AuthKit/AuthKit-0.4.5.tar.gz + +BuildArch: noarch + +BuildRequires: python-setuptools +BuildRequires: python2-devel + +Requires: python-beaker +Requires: python-decorator +Requires: python-nose +Requires: python-openid +Requires: python-paste +Requires: python-paste-deploy +Requires: python-paste-script +Requires: python-webob + +Patch0: python-authkit.patch + +%description +* Built for WSGI applications and middleware +* Sophisticated and extensible permissions system +* Built in support for HTTP basic, HTTP digest, form, cookie and + OpenID authentication methods plus others +* Easily define users, passwords and roles +* Designed to be totally extensible so you can use the components to + integrate with a database, LDAP connection or your own custom system +* Plays nicely with the Pylons web framework + + +%prep +%setup -q -n AuthKit-%{version} +%patch0 -p1 + + +%build +# Remove CFLAGS=... for noarch packages (unneeded) +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build + + +%install +rm -rf $RPM_BUILD_ROOT +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT + + +%files +%doc +# For noarch packages: sitelib +%{python_sitelib}/* + + +%changelog +* Thu Aug 28 2014 Alex Chernyakhovsky - 0.4.5-2 +- Correct ElementTree import. + +* Thu Aug 28 2014 Alex Chernyakhovsky - 0.4.5-1 +- Initial packaging. Index: trunk/server/fedora/specs/rubygem-fcgi.spec =================================================================== --- trunk/server/fedora/specs/rubygem-fcgi.spec (revision 2591) +++ trunk/server/fedora/specs/rubygem-fcgi.spec (revision 2591) @@ -0,0 +1,86 @@ +# Generated from fcgi-0.9.1.gem by gem2rpm -*- rpm-spec -*- +%global gem_name fcgi + +Name: rubygem-%{gem_name} +Version: 0.9.2.1 +Release: 1.scripts.%{scriptsversion}%{?dist} +Summary: FastCGI library for Ruby +Group: Development/Languages +License: BSDL +URL: http://github.com/alphallc/ruby-fcgi-ng +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +Requires: ruby(release) +Requires: ruby(rubygems) +Requires: fcgi-devel +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby-devel +BuildRequires: fcgi-devel +Provides: rubygem(%{gem_name}) = %{version} + +%description +FastCGI is a language independent, scalable, open extension to CGI that +provides high performance without the limitations of server specific APIs. +This version aims to be compatible with both 1.8.x and 1.9.x versions of Ruby, +and also will be ported to 2.0.x. + + +%package doc +Summary: Documentation for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +Documentation for %{name} + +%prep +gem unpack %{SOURCE0} + +%setup -q -D -T -n %{gem_name}-%{version} + +gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec + +%build +# Create the gem as gem install only works on a gem file +gem build %{gem_name}.gemspec + +# %%gem_install compiles any C extensions and installs the gem into ./%gem_dir +# by default, so that we can move it into the buildroot in %%install +%gem_install + +%install +mkdir -p %{buildroot}%{gem_dir} +cp -pa .%{gem_dir}/* \ + %{buildroot}%{gem_dir}/ + +mkdir -p %{buildroot}%{gem_extdir_mri}/lib +# TODO: move the extensions +# mv %{buildroot}%{gem_instdir}/lib/shared_object.so %{buildroot}%{gem_extdir_mri}/lib/ + + + +%files +%dir %{gem_instdir} +%{gem_libdir} +%exclude %{gem_instdir}/ext +%{gem_extdir_mri} +%exclude %{gem_cache} +%{gem_spec} + +%files doc +%doc %{gem_docdir} +%doc %{gem_instdir}/VERSION +%doc %{gem_instdir}/LICENSE +%doc %{gem_instdir}/README.rdoc +%doc %{gem_instdir}/README.signals +%{gem_instdir}/fcgi.gemspec +%{gem_instdir}/test/helper.rb +%{gem_instdir}/test/test_fcgi.rb + +%changelog +* Sat Jul 19 2014 Benjamin Tidor - 0.9.2.1-1 +- Updated to 0.9.2.1, reconfigured for Sscripts + +* Mon Aug 12 2013 Steven Valdez - 0.9.1-1 +- Initial package Index: trunk/server/fedora/specs/rubygem-pony.spec =================================================================== --- trunk/server/fedora/specs/rubygem-pony.spec (revision 2561) +++ trunk/server/fedora/specs/rubygem-pony.spec (revision 2591) @@ -1,9 +1,8 @@ # Generated from pony-1.8.gem by gem2rpm -*- rpm-spec -*- %global gem_name pony -%global rubyabi 1.9.1 Name: rubygem-%{gem_name} Version: 1.8 -Release: 1%{?dist}.scripts.%{scriptsversion} +Release: 2%{?dist}.scripts.%{scriptsversion} Summary: Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello') Group: Development/Languages @@ -11,8 +10,8 @@ URL: http://github.com/benprew/pony Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -Requires: ruby(abi) = %{rubyabi} +Requires: ruby(release) Requires: ruby(rubygems) Requires: rubygem(mail) >= 2.0 -BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby @@ -72,4 +71,7 @@ %changelog +* Mon May 26 2014 Alexander Chernyakhovsky - 1.8-2 +- Update for Fedora 20 + * Sun Mar 09 2014 Benjamin Tidor - 1.8-1 - Initial package Index: trunk/server/fedora/specs/rubygems.spec.patch =================================================================== --- trunk/server/fedora/specs/rubygems.spec.patch (revision 2561) +++ (revision ) @@ -1,29 +1,0 @@ ---- rubygems.spec.orig 2013-04-05 15:02:08.147935906 -0400 -+++ rubygems.spec 2013-04-05 15:04:14.512566960 -0400 -@@ -26,7 +26,7 @@ - Summary: The Ruby standard for packaging ruby libraries - Name: rubygems - Version: 1.8.25 --Release: 6%{?dist} -+Release: 6%{?dist}.scripts.%{scriptsversion} - Group: Development/Libraries - License: Ruby or MIT - -@@ -60,6 +60,8 @@ - # https://github.com/rubygems/rubygems/issues/210 - Patch109: rubygems-1.8.11-binary-extensions.patch - -+Provides: scripts-rubygems = %{version}-%{release} -+Patch1000: rubygems-rails-require-thread.patch - - Requires: ruby(abi) = 1.9.1 - Requires: rubygem(rdoc) >= 3.9.4 -@@ -105,6 +107,8 @@ - %patch105 -p1 -b .uninst - %patch109 -p1 -b .bindir - -+%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 2561) +++ trunk/server/fedora/specs/scripts-base.spec (revision 2591) @@ -22,5 +22,4 @@ Requires: scripts-openssh-server Requires: scripts-static-cat -Requires: scripts-rubygems Requires: sql-signup Requires: tokensys Index: trunk/server/fedora/specs/scripts-static-cat.spec =================================================================== --- trunk/server/fedora/specs/scripts-static-cat.spec (revision 2561) +++ trunk/server/fedora/specs/scripts-static-cat.spec (revision 2591) @@ -1,5 +1,3 @@ -# cabal2spec-0.25 # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell # Link Haskell libs statically for 3x faster startup speed. @@ -11,22 +9,21 @@ Summary: static-cat for scripts.mit.edu -Group: Applications/System -License: GPL -# BEGIN cabal2spec +License: GPL+ URL: http://scripts.mit.edu/ Source0: %{name}.tar.gz -ExclusiveArch: %{ghc_arches} + BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# END cabal2spec +# Begin cabal-rpm deps: +BuildRequires: ghc-MonadCatchIO-mtl-devel BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-cgi-devel >= 3001.1.8 +BuildRequires: ghc-cgi-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-filepath-devel -BuildRequires: ghc-MonadCatchIO-mtl-devel BuildRequires: ghc-old-locale-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-unix-handle-devel +# End cabal-rpm deps %description @@ -51,4 +48,7 @@ %changelog +* Mon May 26 2014 Alexander Chernyakhovsky - 0.0-0 +- Updated for F20 with cabal-rpm + * Fri May 25 2012 Anders Kaseorg - 0.0-0 - regenerated packaging with cabal2spec-0.25.5 Index: trunk/server/fedora/specs/zephyr.spec =================================================================== --- trunk/server/fedora/specs/zephyr.spec (revision 2561) +++ trunk/server/fedora/specs/zephyr.spec (revision 2591) @@ -1,4 +1,6 @@ Name: zephyr -Version: 3.0.2 +Version: 3.1.2 +%define commit 54c6b84a81301a1691f9bec10c63c1e36166df9d +%define shortcommit %(c=%{commit}; echo ${c:0:7}) Release: 0.%{scriptsversion}%{?dist} Summary: Client programs for the Zephyr real-time messaging system @@ -7,5 +9,5 @@ License: MIT URL: http://zephyr.1ts.org/ -Source0: http://zephyr.1ts.org/export/HEAD/distribution/%{name}-%{version}.tar.gz +Source0: https://github.com/zephyr-im/zephyr/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz Source1: zhm.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,5 +61,5 @@ %prep -%setup -q +%setup -q -n %{name}-%{commit} cp -p %{SOURCE1} . @@ -142,7 +144,10 @@ %{_libdir}/*.so %{_includedir}/* - +%{_libdir}/pkgconfig/zephyr.pc %changelog +* Mon May 26 2014 Alexander Chernyakhovsky - 3.1.2-0 +- Update to Zephyr 3.1.2, fix packaging for F20 + * Sat Apr 16 2011 Alexander Chernyakhovsky 3.0.1-0 - Zephyr 3.0.1 Index: trunk/server/fedora/specs/zhm.init =================================================================== --- trunk/server/fedora/specs/zhm.init (revision 2561) +++ trunk/server/fedora/specs/zhm.init (revision 2591) @@ -14,6 +14,6 @@ ### BEGIN INIT INFO # Provides: zhm -# Required-Start: $local_fs $remote_fs $network $named -# Required-Stop: $local_fs $remote_fs $network +# Required-Start: $local_fs $network $named +# Required-Stop: $local_fs $network # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6