calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

Update nginx.

Browse Source
atratsevskiy
Mike Hiretsky 13 years ago
parent 80e877ff54
commit a58a92a132
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File

4
www-servers/nginx/Manifest
Unescape View File

@ -1,5 +1,5 @@
AUX cgiwrap-fcgi.init 659 RMD160 8740bcc05a0911a58dc470e6b455d8a452d31584 SHA1 853d8bdb044c4cddd7fa86f4700fa5a8fb297477 SHA256 e2e508255b764679b7c564bf42d2da6d56428387fbb91fa123d0a7815dd7e3fb
AUX cgiwrap-fcgi.pl 3207 RMD160 c3c667f55c5a66882d5fe9296c6e0a4ec2c38250 SHA1 f1b234ab792639b6707aa69e3ab9017ff3716879 SHA256 0f0e5f127830477daa574e811e1efd77fd154a53c8ef0c551f9aaa583b85c012
AUX cgiwrap-fcgi.pl 3387 RMD160 5f73d72e4812ce991de31c4ce75a100151b0c324 SHA1 6c8ec601db9c83f2281aa7c822143b4d47a31e9e SHA256 2ec28a105e7df07ff14b4b8558e9cbf42491bb457f39d4a3f4c6a741ff443091
AUX nginx.conf-r4 1358 RMD160 a948df249a16be86c114d587cfa5ee570d84a356 SHA1 e9db0447a1beb326a0858cf8189328229d1d3edf SHA256 6ff6c9301ea2a4d74a335b9119d7f9dba87d4e83793cf22d837d49f061763096
AUX nginx.init-r2 1827 RMD160 2ece9278fd4a3ca948106e024c2607fca02e2599 SHA1 76af70e8fcad8b298851382d18160d11dc3e2cca SHA256 89801c2e0ea3480380dedfbc84b0cc993ab6b93768886246a22e650ba0a61798
AUX nginx.logrotate 364 RMD160 9fdfd2ea2f49b8dba20a030d893e34779bb32364 SHA1 4ab07992fa5c64f753e3643e1b51fcab4dec6ccf SHA256 9e3e090dfd10861d5f9b279e19113ce8d05caf9f33d488f6aabf9f19ac0cf925
@ -12,6 +12,6 @@ DIST ngx_http_headers_more-0.15.tar.gz 22738 RMD160 2200ab529a086dd6bcf11a9a0470
DIST ngx_slowfs_cache-1.6.tar.gz 10972 RMD160 e1d10851db4a55fc465665caa3f6989d142af2d3 SHA1 072d06b7547629b244bebeef7df7425567f264c9 SHA256 cc0505dbba30153691ff7b3a7353804d5ceb9a519a407b938cae49e9913a7bcc
DIST ngx_upload_progress-0.8.2.tar.gz 16559 RMD160 3aadb9bf9b15b3810d1acb466d331ea5bdae6062 SHA1 cbff2734cccc3ac93b3422a9a01547af29f9c11d SHA256 cab70d2e300cfa0d9d7d3b34bf27810533ecbf11dddcd5078a4754cfab337c95
DIST passenger-3.0.8.tar.gz 2362561 RMD160 1264b76a3440492b3d435050007611735a627c72 SHA1 265d1dcb66a29b944fa475f7d6831ce16ac37e2e SHA256 ccef21dc97b54de17c1d44644b2bc67b7732a860ff67206a4c557727311a8349
EBUILD nginx-1.1.2-r10.ebuild 11528 RMD160 e35ddc9ef5216b67844cb8a9f74bb34d3fe53e41 SHA1 b70572b2ec7947396cc187a70c776f750e8d713c SHA256 25f5c7493e2e5970e698169a0eedb0d38ef8d78a7248594fefba978debfd3001
EBUILD nginx-1.1.2-r11.ebuild 11583 RMD160 2a665bc67d49f085baafeb6cb9f2a5a2d6e2e01d SHA1 4953dbe3dbac29022cdb61a0df1cdd51f490fcb5 SHA256 0a8aa9f49bc1b3a63f7b4d1c2b3b26bec8223d447516cc25b4d12abc6eb64c12
MISC ChangeLog 47899 RMD160 2fd3f3a9466abcb048d5155cd5c6987a94c69bdf SHA1 aeb5bdc8a5072b0b1fe14cf16334904b0cc86af4 SHA256 1527b46149d4bc47deaf3d4003e2aa54b4207c86a56b25b20e9ff3be962e05ca
MISC metadata.xml 2402 RMD160 fee632a79ad08ef0fe36cd73d718a81348d71370 SHA1 12b7d3eac7a8e9f99dbe2b64bc288aa5e3f4608c SHA256 f133dca88780f2716797c5d2fc309466013d35b3dccf752ab27fb4ee399c6e47

7
www-servers/nginx/files/cgiwrap-fcgi.pl
Unescape View File

@ -90,7 +90,12 @@ sub request_loop {
#fcntl(CHILD_RD, F_DUPFD, 0);
syscall(&SYS_dup2, fileno(CHILD_RD), 0);
#open(STDIN, "<&CHILD_RD");
exec($req_params{SCRIPT_FILENAME});
my $SCRIPTUSER = $req_params{SCRIPT_USER} or "";
if($SCRIPTUSER eq "")
exec($req_params{SCRIPT_FILENAME});
else {
exec("su -c \"$req_params{SCRIPT_FILENAME}\" -s /bin/sh ${SCRIPTUSER}");
}
die("exec failed");
}
}

27
www-servers/nginx/nginx-1.1.2-r10.ebuild → www-servers/nginx/nginx-1.1.2-r11.ebuild
Unescape View File

@ -133,7 +133,8 @@ DEPEND="${CDEPEND}
libatomic? ( dev-libs/libatomic_ops )"
PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
S="${WORKDIR}/all/${P}"
ALLWORKDIR="${WORKDIR}/all"
S="${ALLWORKDIR}/${P}"
pkg_setup() {
ebegin "Creating nginx user and group"
@ -168,7 +169,7 @@ src_prepare() {
sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
if use nginx_modules_http_passenger; then
cd "${WORKDIR}/all/${HTTP_PASSENGER_MODULE_P}"
cd "${ALLWORKDIR}/${HTTP_PASSENGER_MODULE_P}"
pwd
epatch "${FILESDIR}/passenger-CFLAGS-headers.patch"
fi
@ -206,37 +207,37 @@ src_configure() {
# third-party modules
if use nginx_modules_http_upload_progress; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
myconf+=" --add-module=${ALLWORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
fi
if use nginx_modules_http_headers_more; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
myconf+=" --add-module=${ALLWORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
fi
if use nginx_modules_http_push; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
myconf+=" --add-module=${ALLWORKDIR}/${HTTP_PUSH_MODULE_P}"
fi
if use nginx_modules_http_cache_purge; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
myconf+=" --add-module=${ALLWORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
fi
if use nginx_modules_http_upload; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
myconf+=" --add-module=${ALLWORKDIR}/${HTTP_UPLOAD_MODULE_P}"
fi
if use nginx_modules_http_slowfs_cache; then
http_enabled=1
myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
myconf+=" --add-module=${ALLWORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
fi
if use nginx_modules_http_passenger; then
http_enabled=1
myconf="${myconf} --add-module=${WORKDIR}/all/${HTTP_PASSENGER_MODULE_P}/ext/nginx"
myconf="${myconf} --add-module=${ALLWORKDIR}/${HTTP_PASSENGER_MODULE_P}/ext/nginx"
fi
if use http || use http-cache; then
@ -330,22 +331,22 @@ src_install() {
if use nginx_modules_http_push; then
docinto ${HTTP_PUSH_MODULE_P}
dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
dodoc "${ALLWORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
fi
if use nginx_modules_http_cache_purge; then
docinto ${HTTP_CACHE_PURGE_MODULE_P}
dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README}
dodoc "${ALLWORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README}
fi
if use nginx_modules_http_upload; then
docinto ${HTTP_UPLOAD_MODULE_P}
dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
dodoc "${ALLWORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
fi
if use nginx_modules_http_slowfs_cache; then
docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README}
dodoc "${ALLWORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README}
fi
}
Write Preview
Loading…
Cancel
Save