Merge branch 'new_dev' into nginx

jingjingxyk · Dec 31, 2023 · 172656a · 172656a
2 parents d617ea1 + dd5f2cb
commit 172656a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/sapi/src/builder/extension/privoxy.php b/sapi/src/builder/extension/privoxy.php
@@ -25,6 +25,7 @@
                 cd {$privoxy_prefix}/../
                 ls -lh privoxy
                 cp -rf privoxy {$workdir}/bin/
+                strip {$workdir}/bin/privoxy/sbin/privoxy
                 PRIVOXY_VERSION=$({$workdir}/bin/privoxy/sbin/privoxy --help | grep 'Privoxy version' | awk '{print $3}')
 
 EOF;

diff --git a/sapi/src/builder/extension/socat.php b/sapi/src/builder/extension/socat.php
@@ -22,9 +22,9 @@
                 cd {$builddir}/socat
                 cp -f socat {$workdir}/bin/
                 cp -rf doc {$workdir}/bin/socat-docs
-                cd {$builddir}/socat
+                cd {$workdir}/bin/
                 SOCAT_VERSION=$({$workdir}/bin/socat -V | grep 'socat version' | awk '{ print $3 }')
-                strip {$builddir}/socat
+                strip {$workdir}/bin/socat
 
 EOF;
         if ($p->getOsType() == 'macos') {

diff --git a/sapi/src/builder/library/nginx.php b/sapi/src/builder/library/nginx.php
@@ -32,8 +32,8 @@
                 # hg update -C release-1.25.2
                 # git clone -b release-1.25.2 --depth 1 --progress  https://github.com/nginx/nginx.git
 
-                # hg  clone -r release-1.25.2 --rev=1  http://hg.nginx.org/nginx
-                hg  clone -r default --rev=1  http://hg.nginx.org/nginx
+                hg  clone -r release-1.25.3 --rev=1  http://hg.nginx.org/nginx
+                # hg  clone -r default --rev=1  http://hg.nginx.org/nginx
 
 EOF
             )

diff --git a/sapi/src/builder/library/privoxy.php b/sapi/src/builder/library/privoxy.php
@@ -5,6 +5,10 @@
 
 return function (Preprocessor $p) {
     $privoxy_prefix = PRIVOXY_PREFIX;
+
+    $cflags = $p->getOsType() == 'macos' ? "" : '-static';
+    $options = $p->getOsType() == 'macos' ? "" : '--enable-static-linking';
+
     $p->addLibrary(
         (new Library('privoxy'))
             ->withHomePage('https://www.privoxy.org')
@@ -45,13 +49,14 @@
                 PACKAGES="openssl zlib"
                 PACKAGES="\$PACKAGES  libbrotlicommon  libbrotlidec  libbrotlienc "
                 PACKAGES="\$PACKAGES libpcre  libpcre16  libpcre32  libpcrecpp  libpcreposix"
+                CFLAGS=" {$cflags} " \
                 CPPFLAGS="$(pkg-config  --cflags-only-I --static \$PACKAGES )" \
                 LDFLAGS="$(pkg-config   --libs-only-L   --static \$PACKAGES )" \
                 LIBS="$(pkg-config      --libs-only-l   --static \$PACKAGES )" \
                 PCRE_STATIC=YES \
                 ./configure \
                 --prefix={$privoxy_prefix} \
-                --enable-static-linking \
+                 {$options} \
                 --with-openssl \
                 --without-mbedtls \
                 --with-brotli \