diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
| commit | c6e5d0d788ee2654a67bac4429d92f1f1df64c69 (patch) | |
| tree | 84d3087e9c9f9aab24d69f83c8e7d1d7bde8dd17 /extra/mod_perl | |
| parent | 89bffd8b9efae5fd29ca78a4741839ca68eb108f (diff) | |
| parent | bc83221d3c667b70e51dfff6ed212aada3906ee6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kid3/kid3.install
community/cherokee/PKGBUILD
community/supercollider/supercollider.install
core/libusb/PKGBUILD
core/systemd/PKGBUILD
core/udev/PKGBUILD
extra/gimp-devel/PKGBUILD
extra/maxima/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
staging/kdebase-workspace/kdm
staging/kdebindings-perlkde/PKGBUILD
staging/kdebindings-perlqt/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdeplasma-addons/kdeplasma-addons-applets.install
Diffstat (limited to 'extra/mod_perl')
| -rw-r--r-- | extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch | 17 | ||||
| -rw-r--r-- | extra/mod_perl/nolfs.patch | 14 |
2 files changed, 0 insertions, 31 deletions
diff --git a/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch b/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch deleted file mode 100644 index 4e26fd87d..000000000 --- a/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -upr mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c mod_perl-2.0.6/src/modules/perl/modperl_perl.c ---- mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c 2012-05-26 21:49:27.000000000 +0300 -+++ mod_perl-2.0.6/src/modules/perl/modperl_perl.c 2012-05-26 21:55:39.000000000 +0300 -@@ -102,13 +102,4 @@ static void modperl_perl_init_ids(pTHX_ - sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid); - --#ifndef WIN32 -- PL_uid = ids->uid; -- PL_euid = ids->euid; -- PL_gid = ids->gid; -- PL_egid = ids->egid; --#endif --#ifdef MP_MAINTAIN_PPID -- PL_ppid = ids->ppid; --#endif - } - diff --git a/extra/mod_perl/nolfs.patch b/extra/mod_perl/nolfs.patch deleted file mode 100644 index 3eb345b66..000000000 --- a/extra/mod_perl/nolfs.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: mod_perl-2.0.5/lib/Apache2/Build.pm -=================================================================== ---- mod_perl-2.0.5.orig/lib/Apache2/Build.pm 2011-02-02 21:23:47.000000000 +0100 -+++ mod_perl-2.0.5/lib/Apache2/Build.pm 2011-05-26 17:12:46.276946520 +0200 -@@ -2147,7 +2147,8 @@ sub has_large_files_conflict { - # with it is that we didn't have such a case yet, but may need to - # deal with it later - -- return $perl_lfs64 ^ $apr_lfs64; -+ return 0; -+ # $perl_lfs64 ^ $apr_lfs64; - } - - # if perl is built with uselargefiles, but apr not, the build won't |