2026-04-13 00:10:11 +08:00
11 changed files with 98 additions and 215 deletions
--- a/.github/workflows/build-rpm-arm64.yml
+++ b/.github/workflows/build-rpm-arm64.yml
@ -1,71 +0,0 @@
-name: RPM build arm
-
-on:
-  push:
-    branches: [ "master" ]
-    paths: [ 'RELEASE', '.github/workflows/build-rpm-arm64.yml' ]
-
-jobs:
-  ci:
-    name: "${{ matrix.target }}"
-    strategy:
-      matrix:
-        target:
-          - ubuntu-latest
-    runs-on: ${{ matrix.target }}
-    steps:
-    - uses: actions/checkout@v4
-    - name: env
-      run: |
-       pwd
-       echo "RELEASE=$(cat RELEASE)" >> $GITHUB_ENV
-       echo "VERSION=$(date +%y%m%d%H%M%S)" >> $GITHUB_ENV
-       echo "MAJOR=$(cat RELEASE | cut -d "-" -f 1)" >> $GITHUB_ENV
-       echo "SUBMAJOR=$(cat RELEASE | cut -d "-" -f 2)" >> $GITHUB_ENV
-       echo "MINOR=$(cat RELEASE | cut -d "-" -f 3)" >> $GITHUB_ENV
-    - name: Linux libraries
-      run: |
-       sudo apt update
-       sudo dpkg --add-architecture arm64
-       echo "Types: deb" > ~/ubuntu.sources
-       echo "URIs: http://archive.ubuntu.com/ubuntu/" >> ~/ubuntu.sources 
-       echo "Suites: noble noble-updates noble-backports" >> ~/ubuntu.sources 
-       echo "Components: main restricted universe multiverse" >> ~/ubuntu.sources 
-       echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >> ~/ubuntu.sources 
-       echo "Architectures: amd64" >> ~/ubuntu.sources 
-       echo "" >> ~/ubuntu.sources 
-       echo "Types: deb" >> ~/ubuntu.sources 
-       echo "URIs: http://security.ubuntu.com/ubuntu/" >> ~/ubuntu.sources 
-       echo "Suites: noble-security" >> ~/ubuntu.sources 
-       echo "Components: main restricted universe multiverse" >> ~/ubuntu.sources 
-       echo "Architectures: amd64" >> ~/ubuntu.sources 
-       echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >> ~/ubuntu.sources 
-       echo "" >> ~/ubuntu.sources 
-       echo "Types: deb" >>~/ubuntu.sources 
-       echo "URIs: http://ports.ubuntu.com/ubuntu-ports/" >>~/ubuntu.sources
-       echo "Suites: noble noble-updates" >>~/ubuntu.sources
-       echo "Components: main restricted universe multiverse" >>~/ubuntu.sources
-       echo "Architectures: arm64" >>~/ubuntu.sources
-       echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >>~/ubuntu.sources
-       sudo cp ~/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources
-       sudo apt update
-       sudo apt install libssl-dev:arm64 libpam0g:arm64 libpam0g-dev:arm64 libpcre2-dev:arm64 rpm crossbuild-essential-arm64
-    - name: make rpmbuild dir
-      run: mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-    - name: configure rpm env
-      run: |
-       tar -czf ~/rpmbuild/SOURCES/3proxy-$RELEASE.tar.gz --transform "s,^,3proxy-$RELEASE/," .
-       ln -s ~/rpmbuild/SOURCES/3proxy-$RELEASE.tar.gz ~/rpmbuild/SOURCES/$RELEASE.tar.gz
-       cp scripts/rh/3proxy.spec ~/rpmbuild/SPECS/3proxy-$RELEASE.spec
-    - name: rpmbuild
-      run: |
-       ret=`pwd`
-       cd ~/rpmbuild/SPECS
-       rpmbuild -ba --define "PAMLIB pam0g" --define "_arch aarch64" --define "cross yes" --target=aarch64-linux-gnueabi 3proxy-$RELEASE.spec
-       cd $ret
-       mv ~/rpmbuild/RPMS/aarch64/3proxy-$RELEASE-1.aarch64.rpm 3proxy-$RELEASE.arm64.rpm
-    - name: Get artifact
-      uses: actions/upload-artifact@v4
-      with:
-       name: "3proxy-${{ env.RELEASE }}-arm64.rpm"
-       path: "*.rpm"
--- a/.github/workflows/build-rpm-armhf.yml
+++ b/.github/workflows/build-rpm-armhf.yml
@ -1,72 +0,0 @@
-name: RPM build arm
-
-on:
-  push:
-    branches: [ "master" ]
-    paths: [ 'RELEASE', '.github/workflows/build-rpm-armhf.yml' ]
-
-jobs:
-  ci:
-    name: "${{ matrix.target }}"
-    strategy:
-      matrix:
-        target:
-          - ubuntu-latest
-    runs-on: ${{ matrix.target }}
-    steps:
-    - uses: actions/checkout@v4
-    - name: env
-      run: |
-       pwd
-       echo "RELEASE=$(cat RELEASE)" >> $GITHUB_ENV
-       echo "VERSION=$(date +%y%m%d%H%M%S)" >> $GITHUB_ENV
-       echo "MAJOR=$(cat RELEASE | cut -d "-" -f 1)" >> $GITHUB_ENV
-       echo "SUBMAJOR=$(cat RELEASE | cut -d "-" -f 2)" >> $GITHUB_ENV
-       echo "MINOR=$(cat RELEASE | cut -d "-" -f 3)" >> $GITHUB_ENV
-    - name: Linux libraries
-      run: |
-       sudo apt update
-       sudo dpkg --add-architecture armhf
-       echo "Types: deb" > ~/ubuntu.sources
-       echo "URIs: http://archive.ubuntu.com/ubuntu/" >> ~/ubuntu.sources 
-       echo "Suites: noble noble-updates noble-backports" >> ~/ubuntu.sources 
-       echo "Components: main restricted universe multiverse" >> ~/ubuntu.sources 
-       echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >> ~/ubuntu.sources 
-       echo "Architectures: amd64" >> ~/ubuntu.sources 
-       echo "" >> ~/ubuntu.sources 
-       echo "Types: deb" >> ~/ubuntu.sources 
-       echo "URIs: http://security.ubuntu.com/ubuntu/" >> ~/ubuntu.sources 
-       echo "Suites: noble-security" >> ~/ubuntu.sources 
-       echo "Components: main restricted universe multiverse" >> ~/ubuntu.sources 
-       echo "Architectures: amd64" >> ~/ubuntu.sources 
-       echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >> ~/ubuntu.sources 
-       echo "" >> ~/ubuntu.sources 
-       echo "Types: deb" >>~/ubuntu.sources 
-       echo "URIs: http://ports.ubuntu.com/ubuntu-ports/" >>~/ubuntu.sources
-       echo "Suites: noble noble-updates" >>~/ubuntu.sources
-       echo "Components: main restricted universe multiverse" >>~/ubuntu.sources
-       echo "Architectures: armhf" >>~/ubuntu.sources
-       echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >>~/ubuntu.sources
-       sudo cp ~/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources
-       sudo apt update
-       sudo apt install libssl-dev:armhf libpam0g:armhf libpam0g-dev:armhf libpcre2-dev:armhf rpm crossbuild-essential-armhf
-    - name: make rpmbuild dir
-      run: mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-    - name: configure rpm env
-      run: |
-       tar -czf ~/rpmbuild/SOURCES/3proxy-$RELEASE.tar.gz --transform "s,^,3proxy-$RELEASE/," .
-       ln -s ~/rpmbuild/SOURCES/3proxy-$RELEASE.tar.gz ~/rpmbuild/SOURCES/$RELEASE.tar.gz
-       cp scripts/rh/3proxy.spec ~/rpmbuild/SPECS/3proxy-$RELEASE.spec
-    - name: rpmbuild
-      run: |
-       ret=`pwd`
-       cd ~/rpmbuild/SPECS
-       rpmbuild -ba --define "PAMLIB pam0g" --define "_arch arm" --define "cross yes" --target=arm-linux-gnueabi 3proxy-$RELEASE.spec
-       cd $ret
-       mv ~/rpmbuild/RPMS/arm/3proxy-$RELEASE-1.arm.rpm 3proxy-$RELEASE.arm.rpm
-    - name: Get artifact
-      uses: actions/upload-artifact@v4
-      with:
-       name: "3proxy-${{ env.RELEASE }}-arm.rpm"
-       path: "*.rpm"
-
--- a/.github/workflows/build-rpm-x86-64.yml
+++ b/.github/workflows/build-rpm-x86-64.yml
@ -1,51 +0,0 @@
-name: RPM build x86-64
-
-on:
-  push:
-    branches: [ "master" ]
-    paths: [ 'RELEASE', '.github/workflows/build-rpm-x86-64.yml' ]
-
-jobs:
-  ci:
-    name: "${{ matrix.target }}"
-    strategy:
-      matrix:
-        target:
-          - ubuntu-latest
-    runs-on: ${{ matrix.target }}
-    steps:
-    - uses: actions/checkout@v4
-    - name: env
-      run: |
-       pwd
-       echo "RELEASE=$(cat RELEASE)" >> $GITHUB_ENV
-       echo "VERSION=$(date +%y%m%d%H%M%S)" >> $GITHUB_ENV
-       echo "MAJOR=$(cat RELEASE | cut -d "-" -f 1)" >> $GITHUB_ENV
-       echo "SUBMAJOR=$(cat RELEASE | cut -d "-" -f 2)" >> $GITHUB_ENV
-       echo "MINOR=$(cat RELEASE | cut -d "-" -f 3)" >> $GITHUB_ENV
-    - name: echo env
-      run: echo "release $RELEASE version $VERSION major $MAJOR submajor $SUBMAJOR minor $MINOR"
-    - name: Linux libraries
-      run: |
-       sudo apt update
-       sudo apt install libssl-dev libpam-dev libpcre2-dev rpm
-    - name: make rpmbuild dir
-      run: mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-    - name: configure rpm env
-      run: |
-       tar -czf ~/rpmbuild/SOURCES/3proxy-$RELEASE.tar.gz --transform "s,^,3proxy-$RELEASE/," .
-       ln -s ~/rpmbuild/SOURCES/3proxy-$RELEASE.tar.gz ~/rpmbuild/SOURCES/$RELEASE.tar.gz
-       cp scripts/rh/3proxy.spec ~/rpmbuild/SPECS/3proxy-$RELEASE.spec
-    - name: rpmbuild
-      run: |
-       ret=`pwd`
-       cd ~/rpmbuild/SPECS
-       rpmbuild -ba 3proxy-$RELEASE.spec
-       cd $ret
-       mv ~/rpmbuild/RPMS/x86_64/3proxy-$RELEASE-1.x86_64.rpm 3proxy-$RELEASE.x86_64.rpm
-    - name: Get artifact
-      uses: actions/upload-artifact@v4
-      with:
-       name: "3proxy-${{ env.RELEASE }}-x86_64.rpm"
-       path: "*.rpm"
-
--- a/.github/workflows/build-rpm.yml
+++ b/.github/workflows/build-rpm.yml
@ -0,0 +1,58 @@
+name: RPM build
+
+on:
+  push:
+    branches: [ "master" ]
+    paths: [ 'RELEASE', '.github/workflows/build-rpm.yml' ]
+
+jobs:
+  ci:
+    name: "${{ matrix.target }}"
+    strategy:
+      matrix:
+        target:
+          - ubuntu-latest
+    runs-on: ${{ matrix.target }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: env
+      run: |
+       pwd
+       echo "RELEASE==$(cat RELEASE)" >> $GITHUB_ENV
+       echo "VERSION==$(date +%y%m%d%H%M%S)" >> $GITHUB_ENV
+       echo "MAJOR==$(cat RELEASE | cut -d "-" -f 1)" >> $GITHUB_ENV
+       echo "SUBMAJOR==$(cat RELEASE | cut -d "-" -f 2)" >> $GITHUB_ENV
+       echo "MINOR==$(cat RELEASE | cut -d "-" -f 3)" >> $GITHUB_ENV
+    - name: echo env
+      run: echo "release $RELEASE version $VERSION major $MAJOR submajor $SUBMAJOR minor $MINOR"
+    - name: Linux libraries
+      run: |
+       sudo apt update
+       sudo dpkg --add-architecture arm64
+       sudo dpkg --add-architecture armhf
+       sudo echo "Types: deb\nURIs: http://ports.ubuntu.com/ubuntu-ports/\nSuites: noble noble-updates noble-security\nComponents: main restricted universe multiverse\nArchitectures: arm64\nSigned-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >/etc/apt/sources.list.d/arm64.sources
+       sudo echo "Types: deb\nURIs: http://ports.ubuntu.com/ubuntu-ports/\nSuites: noble noble-updates noble-security\nComponents: main restricted universe multiverse\nArchitectures: armhf\nSigned-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >/etc/apt/sources.list.d/armhf.sources
+       sudo apt update
+       sudo apt install libssl-dev libpam-dev libpcre2-dev libssl-dev:arm64 libpam-dev:arm64 libpcre2-dev:arm64 libssl-dev:armhf libpam-dev:armhf libpcre2-dev:armhf rpm crossbuild-essential-arm64 crossbuild-essential-armhf
+    - name: make rpmbuild dir
+      run: mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+    - name: configure rpm env
+      run: |
+       git archive --format=tar --prefix=3proxy-$RELEASE/ master | gzip >~/rpmbuilds/SOURCES/3proxy-$RELEASE.tar.gz
+       cp scripts/rh/3proxy.spec ~/rpmbuild/SPECS/3proxy-$RELEASE.spec
+    - name: rpmbuild
+      run: |
+       ret=`pwd`
+       cd ~/rpmbuild/SPECS
+       rpmbuild --define "devel_version $VERSION" -ba 3proxy-$RELEASE.spec
+       rpmbuild -ba --define "devel_version $VERSION" --define "_arch arm" --define "cross yes" --target=arm-linux-gnueabi 3proxy-$RELEASE.spec
+       rpmbuild -ba --define "devel_version $VERSION" --define "_arch aarch64" --define "cross yes" --target=aarch64-linux-gnu 3proxy-$RELEASE.spec       
+       cd $ret
+       mv ~/rpmbuild/RPMS/x86_64/3proxy-$RELEASE-1.x86_64.rpm ../3proxy-$RELEASE.x86_64.rpm
+       mv ~/rpmbuild/RPMS/arm/3proxy-$RELEASE-1.arm.rpm ../3proxy-$RELEASE.arm.rpm
+       mv ~/rpmbuild/RPMS/aarch64/3proxy-$RELEASE-1.aarch64.rpm ../3proxy-$RELEASE.aarch64.rpm
+    - name: Get artifact
+      uses: actions/upload-artifact@v4
+      with:
+       name: "3proxy-${{ env.RELEASE }}-rpm"
+       path: "*.rpm"
--- a/.github/workflows/c-cpp-Linux.yml
+++ b/.github/workflows/c-cpp-Linux.yml
@ -3,10 +3,10 @@ name: C/C++ CI Linux
 on:
  push:
    branches: [ "master" ]
-    paths: [ '**.c', '**.h', 'Makefile.Linux', '.github/configs', '.github/workflows/c-cpp-Linux.yml' ]
+    paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp-Linux.yml' ]
  pull_request:
    branches: [ "master" ]
-    paths: [ '**.c', '**.h', 'Makefile.Linux', '.github/configs', '.github/workflows/c-cpp-Linux.yml' ]
+    paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp-Linux.yml' ]

 jobs:
  ci:
--- a/.github/workflows/c-cpp-MacOS.yml
+++ b/.github/workflows/c-cpp-MacOS.yml
@ -3,10 +3,10 @@ name: C/C++ CI MacOS
 on:
  push:
    branches: [ "master" ]
-    paths: [ '**.c', '**.h', 'Makefile.FreeBSD', '.github/configs', '.github/workflows/c-cpp-MacOS.yml' ]
+    paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp-MacOS.yml' ]
  pull_request:
    branches: [ "master" ]
-    paths: [ '**.c', '**.h', 'Makefile.FreeBSD', '.github/configs', '.github/workflows/c-cpp-MacOS.yml' ]
+    paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp-MacOS.yml' ]

 jobs:
  ci:
--- a/.github/workflows/c-cpp-Windows.yml
+++ b/.github/workflows/c-cpp-Windows.yml
@ -3,10 +3,10 @@ name: C/C++ CI Windows
 on:
  push:
    branches: [ "master" ]
-    paths: [ '**.c', '**.h', 'Makefile.msvc', '.github/configs', '.github/workflows/c-cpp-Windows.yml' ]
+    paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp-Windows.yml' ]
  pull_request:
    branches: [ "master" ]
-    paths: [ '**.c', '**.h', 'Makefile.msvc', '.github/configs', '.github/workflows/c-cpp-Windows.yml' ]
+    paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp-Windows.yml' ]

 jobs:
  ci:
--- a/.github/workflows/c-cpp-cmake.yml
+++ b/.github/workflows/c-cpp-cmake.yml
@ -3,10 +3,10 @@ name: C/C++ CI cmake
 on:
  push:
    branches: [ "master" ]
-    paths: [ '**.c', '**.h', '**.cmake', 'CMakeLists.txt', '.github/configs', '.github/workflows/c-cpp-cmake.yml' ]
+    paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp-cmake.yml' ]
  pull_request:
    branches: [ "master" ]
-    paths: [ '**.c', '**.h', '**.cmake', 'CMakeLists.txt', '.github/configs', '.github/workflows/c-cpp-cmake.yml' ]
+    paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp-cmake.yml' ]

 jobs:
  ci:
--- a/Makefile.Linux
+++ b/Makefile.Linux
@ -99,6 +99,7 @@ install-bin:
 	$(INSTALL_BIN) -d $(BINDIR)
 	$(INSTALL_BIN) -s $(INSTALL_OBJS) $(BINDIR)
 	$(INSTALL_BIN) -s bin/*.ld.so $(CHROOTDIR)/libexec
+	chmod -R a-w $(CHROOTDIR)/libexec

 install-etc-dir:
 	$(INSTALL_BIN) -d $(ETCDIR)
--- a/scripts/rh/3proxy.spec
+++ b/scripts/rh/3proxy.spec
@ -1,6 +1,6 @@
 Name:           3proxy
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        1
 Summary:        3proxy tiny proxy server
 License:        GPL/LGPL/Apache/BSD
 URL:            https://3proxy.org/
@ -13,15 +13,11 @@ Source:		https://github.com/%{packager}/%{name}/archive/%{version}.tar.gz
 3proxy is lightweight yet powerful proxy server

 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 ln -s Makefile.Linux Makefile

 %build
-%if "%{?PAMLIB}" != ""
-    make PAMLIB=%{?PAMLIB}
-%else
 make
-%endif

 %install
 make DESTDIR=%buildroot install
@ -48,9 +44,33 @@ make clean
 %config(noreplace) /usr/local/3proxy/conf/add3proxyuser.sh
 %config(noreplace) /usr/local/3proxy/conf/bandlimiters
 %config(noreplace) /usr/local/3proxy/conf/counters
-/usr/local/3proxy/libexec/*.ld.so
-/usr/share/man/man3/*
-/usr/share/man/man8/*
+/usr/local/3proxy/libexec/PCREPlugin.ld.so
+/usr/local/3proxy/libexec/StringsPlugin.ld.so
+/usr/local/3proxy/libexec/TrafficPlugin.ld.so
+/usr/local/3proxy/libexec/TransparentPlugin.ld.so
+%if "%{_arch}" == "arm"
+/usr/share/man/man3/3proxy.cfg.3
+/usr/share/man/man8/3proxy.8
+/usr/share/man/man8/ftppr.8
+/usr/share/man/man8/pop3p.8
+/usr/share/man/man8/proxy.8
+/usr/share/man/man8/smtpp.8
+/usr/share/man/man8/socks.8
+/usr/share/man/man8/tcppm.8
+/usr/share/man/man8/udppm.8
+/usr/share/man/man8/tlspr.8
+%else
+/usr/share/man/man3/3proxy.cfg.3.gz
+/usr/share/man/man8/3proxy.8.gz
+/usr/share/man/man8/ftppr.8.gz
+/usr/share/man/man8/pop3p.8.gz
+/usr/share/man/man8/proxy.8.gz
+/usr/share/man/man8/smtpp.8.gz
+/usr/share/man/man8/socks.8.gz
+/usr/share/man/man8/tcppm.8.gz
+/usr/share/man/man8/udppm.8.gz
+/usr/share/man/man8/tlspr.8.gz
+%endif
 /var/log/3proxy

 %doc doc/*
--- a/src/plugins/PamAuth/Makefile.inc
+++ b/src/plugins/PamAuth/Makefile.inc
@ -1,10 +1,8 @@
-PAMLIB ?= pam
-
 all: $(BUILDDIR)pamauth$(DLSUFFICS)

 pamauth$(OBJSUFFICS): pamauth.c
 	$(CC) $(DCFLAGS) $(CFLAGS) pamauth.c

 $(BUILDDIR)pamauth$(DLSUFFICS): pamauth$(OBJSUFFICS)
-	$(LN) $(LNOUT)../../$(BUILDDIR)pamauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) $(LIBSPREFIX)$(PAMLIB)$(LIBSSUFFIX) pamauth$(OBJSUFFICS)
+	$(LN) $(LNOUT)../../$(BUILDDIR)pamauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) $(LIBSPREFIX)pam$(LIBSSUFFIX) pamauth$(OBJSUFFICS)