Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakub Panek
aports
Commits
8f468db2
Commit
8f468db2
authored
10 years ago
by
Bartłomiej Piotrowski
Browse files
Options
Downloads
Patches
Plain Diff
main/nginx: upgrade to 1.6.0
parent
ef1d7c47
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/nginx/APKBUILD
+4
-8
4 additions, 8 deletions
main/nginx/APKBUILD
main/nginx/musl-sysctl-header.patch
+0
-12
0 additions, 12 deletions
main/nginx/musl-sysctl-header.patch
with
4 additions
and
20 deletions
main/nginx/APKBUILD
+
4
−
8
View file @
8f468db2
...
...
@@ -3,7 +3,7 @@
# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
pkgname
=
nginx
pkgver
=
1.
4.7
pkgver
=
1.
6.0
_nginxrtmpver
=
1.1.0
pkgrel
=
0
pkgdesc
=
"lightweight HTTP and reverse proxy server"
...
...
@@ -15,7 +15,6 @@ makedepends="pcre-dev openssl-dev zlib-dev"
source
=
"http://nginx.org/download/
$pkgname
-
$pkgver
.tar.gz
nginx-rtmp-module-
$_nginxrtmpver
.tar.gz::https://github.com/arut/nginx-rtmp-module/archive/v
$_nginxrtmpver
.tar.gz
musl-crypt-fix.patch
musl-sysctl-header.patch
ipv6.patch
nginx.initd
...
...
@@ -70,24 +69,21 @@ package() {
install
-m644
-D
LICENSE
"
$pkgdir
"
/usr/share/licenses/
$pkgname
/LICENSE
}
md5sums
=
"
aee151d298dcbfeb88b3f7dd3e7a4d17
nginx-1.
4.7
.tar.gz
md5sums
=
"
8efa354f1c3c2ccf434a50d3fbe82340
nginx-1.
6.0
.tar.gz
ef72159bfdba7a9b0759bd93979d2d4a nginx-rtmp-module-1.1.0.tar.gz
3aeb488921109e60d02ed64d36790aeb musl-crypt-fix.patch
6e68a20796af57c92eece27f06480917 musl-sysctl-header.patch
801a87f7f9d27f8ad85b41a78b4c4461 ipv6.patch
4faf8dff6ff1490edae1688baf1b2abb nginx.initd
8823274a834332d3db4f62bf7dd1fb7d nginx.logrotate"
sha256sums
=
"
23b8ff4a76817090678f91b0efbfcef59a93492f6612dc8370c44c1f1ce1b626
nginx-1.
4.7
.tar.gz
sha256sums
=
"
943ad757a1c3e8b3df2d5c4ddacc508861922e36fa10ea6f8e3a348fc9abfc1a
nginx-1.
6.0
.tar.gz
d57da822b632b52435b159f6358de9474917786f709e197b1e2a81fe7d289d75 nginx-rtmp-module-1.1.0.tar.gz
8c398640bd379c1c6a2fafcd2b3848a72902e47924e8e2490b312c141eec5d70 musl-crypt-fix.patch
4d6ad528e7b1b6946d4387389eaa3aa1c66c7da3062909a75d9b2cf3524a5536 musl-sysctl-header.patch
a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b ipv6.patch
34e9b1dbb9f5fe4d71f7469ded3eb98fac02f57ecfbfd04ba623099766b4709c nginx.initd
cea0c6f8de55a4c3a3eccc57910de1c3116634082c8e5b660630fb927a29f38d nginx.logrotate"
sha512sums
=
"
219c23bb1216f2a65b56a989ea87bed00b50506f7faa726508ede59747d0dd2fb7f7636cc10704c08550fa7da79b3ce1bae8876a6aac97c6e2b4797129887af5
nginx-1.
4.7
.tar.gz
sha512sums
=
"
715b3aa6012e2e29f3b4e6affff4641de0958faa25c0acedb8091b0f4c8506a8912a7e507bcb1f89fc5fe0a1233ab7770dc6ed742698874f43af72b7d08e48f7
nginx-1.
6.0
.tar.gz
fa5ca550939981f2ca0e7669b5357caec49836807c4789d0b8c23fd3fb6e8694374f1eb46f31dc3c7114a90fe87053fc3905b9a70a0a74082db8d003795d8136 nginx-rtmp-module-1.1.0.tar.gz
21114c775e4bdd1f7b8b9abc143284945e96ed1d8c49904ddf918abad87b16253f918ba47976cd2df32f0fdb8a7dad399d4200e879db2da6cf93a28aab236a75 musl-crypt-fix.patch
708879a25b530ee8836e21bc9fd5ef7aad006e0fb236c8ec4b37b169f66fcc95012c14e8bb7502f3956e82047bc3374fced89c8fff0678d5850c7c0ec3e997ef musl-sysctl-header.patch
68d64a84568ec2df0366925ab282a05ebe21a85044b6c7844a47573cfd8cc8ed119cc772358bc3fff36e2d4fdf583a730592825f5f98632993ca86d1f8438d5f ipv6.patch
e153ff131ca5a62f01744c45e97421db0776be518a84a8d09896955a996e5a0133c03cdfa7ac6b03bad75b5cbb839f49dcccbb210843010da42445706f239a12 nginx.initd
01b77cff16f6e8bfd7fa1d4d20f625bbcddd08f0509173452d060c342c93dc315a7b0560f4734323a5d29ea294de0491f2e3f32e5337574e1a28ebc005eceea8 nginx.logrotate"
This diff is collapsed.
Click to expand it.
main/nginx/musl-sysctl-header.patch
deleted
100644 → 0
+
0
−
12
View file @
ef1d7c47
--- ./src/os/unix/ngx_linux_config.h.orig
+++ ./src/os/unix/ngx_linux_config.h
@@ -51,7 +51,9 @@
#include <malloc.h> /* memalign() */
#include <limits.h> /* IOV_MAX */
#include <sys/ioctl.h>
+#ifdef __GLIBC__
#include <sys/sysctl.h>
+#endif
#include <crypt.h>
#include <sys/utsname.h> /* uname() */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment