Changeset 1340 for trunk/server/fedora

Timestamp:

Oct 15, 2009, 12:58:56 AM (15 years ago)

Author:

mitchb

Message:

Revert r1329 - stop scriptsifying activesupport and actionpack gems
We've convinced Fedora to revert to version 2.3.2 and apply the patch
for CVE-2009-3009 there, allowing existing Rails apps to continue
working in F11 with the upstream packages.

Location:

trunk/server/fedora

Files:

• Makefile (modified) (3 diffs)
• specs/rubygem-actionpack.spec.patch (deleted)
• specs/rubygem-activesupport.spec.patch (deleted)

trunk/server/fedora/Makefile

@@ -19 +19 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum    = krb5 krb5.i586 httpd openssh php rubygem-activesupport-2.3.2-1.fc11 rubygem-actionpack-2.3.2-1.fc11
+upstream_yum    = krb5 krb5.i586 httpd openssh php
 upstream        = openafs $(upstream_yum)
 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr athrun php_scripts scripts-base
@@ -137 +137 @@
         /usr/bin/mock -r scripts-fc11-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
 
-$(upstream) rubygem-activesupport rubygem-actionpack openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
+$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
 
 $(filter %.i586,$(upstream)): %.i586: setup patch-specs
@@ -143 +143 @@
         /usr/bin/mock -r scripts-fc11-i386 --arch=i586 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
 
-$(filter-out %.i586,$(upstream)) rubygem-activesupport rubygem-actionpack: %: setup patch-specs
+$(filter-out %.i586,$(upstream)): %: setup patch-specs
         rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
         /usr/bin/mock -r scripts-fc11-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`