Date: Friday, March 10, 2023 @ 08:22:26
Author: mtorromeo
Revision: 1417209
archrelease: copy trunk to community-x86_64
Added:
nginx-mod-njs/repos/community-x86_64/PKGBUILD
(from rev 1417208, nginx-mod-njs/trunk/PKGBUILD)
nginx-mod-njs/repos/community-x86_64/stream-libxslt-fix.patch
(from rev 1417208, nginx-mod-njs/trunk/stream-libxslt-fix.patch)
Deleted:
nginx-mod-njs/repos/community-x86_64/PKGBUILD
nginx-mod-njs/repos/community-x86_64/stream-libxslt-fix.patch
--------------------------+
PKGBUILD | 113 +++++++++++++++++++++------------------------
stream-libxslt-fix.patch | 26 +++++-----
2 files changed, 67 insertions(+), 72 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-10 08:21:57 UTC (rev 1417208)
+++ PKGBUILD 2023-03-10 08:22:26 UTC (rev 1417209)
@@ -1,59 +0,0 @@
-# Maintainer: Massimiliano Torromeo <[email protected]>
-
-pkgname=nginx-mod-njs
-pkgver=0.7.10
-pkgrel=2
-
-_modname="${pkgname#nginx-mod-}"
-
-pkgdesc='nginScript module for nginx'
-arch=('x86_64')
-depends=('nginx' 'libxslt')
-makedepends=('nginx-src')
-url="https://nginx.org/en/docs/njs_about.html";
-license=('CUSTOM')
-
-source=(njs-$pkgver.tar.gz::https://hg.nginx.org/njs/archive/$pkgver.tar.gz
- stream-libxslt-fix.patch)
-sha256sums=('56f4aa35101a98ed4d76edee824f8e20b4e784abf4dc5433441ea08f12e7388f'
- '436f22f863d08932283e4acd25dc64840eb741c90f50cae4d4d4cdd06b09da3b')
-
-prepare() {
- mkdir -p build
- cd build
- ln -sf /usr/src/nginx/auto
- ln -sf /usr/src/nginx/src
-
- cd ../njs-$pkgver
- patch -p1 -i "$srcdir/stream-libxslt-fix.patch"
-}
-
-build() {
- cd "$srcdir/njs-$pkgver"
- CFLAGS="$CFLAGS -Wno-dangling-pointer" ./configure
- make njs
-
- # next configure cleans the build directory
- mv build/njs ../build/
-
- cd "$srcdir/build"
- /usr/src/nginx/configure \
- --with-compat \
- --with-stream \
- --with-http_ssl_module \
- --with-http_v2_module \
- --add-dynamic-module=../njs-$pkgver/nginx
- make modules
-}
-
-package() {
- install -Dm644 "$srcdir"/njs-$pkgver/LICENSE \
- "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
- install -Dm755 build/njs "$pkgdir"/usr/bin/njs
-
- cd build/objs
- for mod in *.so; do
- install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
- done
-}
Copied: nginx-mod-njs/repos/community-x86_64/PKGBUILD (from rev 1417208,
nginx-mod-njs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-10 08:22:26 UTC (rev 1417209)
@@ -0,0 +1,54 @@
+# Maintainer: Massimiliano Torromeo <[email protected]>
+
+pkgname=nginx-mod-njs
+pkgver=0.7.11
+pkgrel=1
+
+_modname="${pkgname#nginx-mod-}"
+
+pkgdesc='nginScript module for nginx'
+arch=('x86_64')
+depends=('nginx' 'libxslt')
+makedepends=('nginx-src')
+url="https://nginx.org/en/docs/njs_about.html";
+license=('CUSTOM')
+
+source=(njs-$pkgver.tar.gz::https://hg.nginx.org/njs/archive/$pkgver.tar.gz)
+sha256sums=('6661a8e545ffadf8561f2d4a097e75fed420141eebbb06a4d09d51a507a4938f')
+
+prepare() {
+ mkdir -p build
+ cd build
+ ln -sf /usr/src/nginx/auto
+ ln -sf /usr/src/nginx/src
+}
+
+build() {
+ cd "$srcdir/njs-$pkgver"
+ CFLAGS="$CFLAGS -Wno-dangling-pointer" ./configure
+ make njs
+
+ # next configure cleans the build directory
+ mv build/njs ../build/
+
+ cd "$srcdir/build"
+ /usr/src/nginx/configure \
+ --with-compat \
+ --with-stream \
+ --with-http_ssl_module \
+ --with-http_v2_module \
+ --add-dynamic-module=../njs-$pkgver/nginx
+ make modules
+}
+
+package() {
+ install -Dm644 "$srcdir"/njs-$pkgver/LICENSE \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+ install -Dm755 build/njs "$pkgdir"/usr/bin/njs
+
+ cd build/objs
+ for mod in *.so; do
+ install -Dm755 $mod "$pkgdir"/usr/lib/nginx/modules/$mod
+ done
+}
Deleted: stream-libxslt-fix.patch
===================================================================
--- stream-libxslt-fix.patch 2023-03-10 08:21:57 UTC (rev 1417208)
+++ stream-libxslt-fix.patch 2023-03-10 08:22:26 UTC (rev 1417209)
@@ -1,13 +0,0 @@
-diff --git a/nginx/config b/nginx/config
-index fb7fb92..474aaf1 100644
---- a/nginx/config
-+++ b/nginx/config
-@@ -29,7 +29,7 @@ if [ $STREAM != NO ]; then
- ngx_module_incs="$ngx_addon_dir/../src $ngx_addon_dir/../build"
- ngx_module_deps="$ngx_addon_dir/../build/libnjs.a $NJS_DEPS"
- ngx_module_srcs="$ngx_addon_dir/ngx_stream_js_module.c $NJS_SRCS"
-- ngx_module_libs="PCRE OPENSSL $ngx_addon_dir/../build/libnjs.a -lm"
-+ ngx_module_libs="PCRE OPENSSL LIBXSLT $ngx_addon_dir/../build/libnjs.a
-lm"
-
- . auto/module
- fi
Copied: nginx-mod-njs/repos/community-x86_64/stream-libxslt-fix.patch (from rev
1417208, nginx-mod-njs/trunk/stream-libxslt-fix.patch)
===================================================================
--- stream-libxslt-fix.patch (rev 0)
+++ stream-libxslt-fix.patch 2023-03-10 08:22:26 UTC (rev 1417209)
@@ -0,0 +1,13 @@
+diff --git a/nginx/config b/nginx/config
+index fb7fb92..474aaf1 100644
+--- a/nginx/config
++++ b/nginx/config
+@@ -29,7 +29,7 @@ if [ $STREAM != NO ]; then
+ ngx_module_incs="$ngx_addon_dir/../src $ngx_addon_dir/../build"
+ ngx_module_deps="$ngx_addon_dir/../build/libnjs.a $NJS_DEPS"
+ ngx_module_srcs="$ngx_addon_dir/ngx_stream_js_module.c $NJS_SRCS"
+- ngx_module_libs="PCRE OPENSSL $ngx_addon_dir/../build/libnjs.a -lm"
++ ngx_module_libs="PCRE OPENSSL LIBXSLT $ngx_addon_dir/../build/libnjs.a
-lm"
+
+ . auto/module
+ fi
