Ignore:
Timestamp:
Oct 15, 2009, 12:58:56 AM (13 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.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/Makefile

    r1334 r1340  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 krb5.i586 httpd openssh php rubygem-activesupport-2.3.2-1.fc11 rubygem-actionpack-2.3.2-1.fc11
     21upstream_yum    = krb5 krb5.i586 httpd openssh php
    2222upstream        = openafs $(upstream_yum)
    2323oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr athrun php_scripts scripts-base
     
    137137        /usr/bin/mock -r scripts-fc11-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    138138
    139 $(upstream) rubygem-activesupport rubygem-actionpack openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
     139$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
    140140
    141141$(filter %.i586,$(upstream)): %.i586: setup patch-specs
     
    143143        /usr/bin/mock -r scripts-fc11-i386 --arch=i586 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    144144
    145 $(filter-out %.i586,$(upstream)) rubygem-activesupport rubygem-actionpack: %: setup patch-specs
     145$(filter-out %.i586,$(upstream)): %: setup patch-specs
    146146        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    147147        /usr/bin/mock -r scripts-fc11-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
Note: See TracChangeset for help on using the changeset viewer.