diff --git a/.github/workflows/build-rpm-armhf.yml b/.github/workflows/build-rpm-armhf.yml index 26ac405..a188750 100644 --- a/.github/workflows/build-rpm-armhf.yml +++ b/.github/workflows/build-rpm-armhf.yml @@ -63,6 +63,7 @@ jobs: run: | ret=`pwd` cd ~/rpmbuild/SPECS + PAMLIB=pam0g rpmbuild -ba --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 diff --git a/scripts/rh/3proxy.spec b/scripts/rh/3proxy.spec index 1f23c3a..d6e61b6 100644 --- a/scripts/rh/3proxy.spec +++ b/scripts/rh/3proxy.spec @@ -44,10 +44,10 @@ 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/PCREPlugin.ld.so -/usr/local/3proxy/libexec/SSLPlugin.ld.so +%config(missingok) /usr/local/3proxy/libexec/PCREPlugin.ld.so +%config(missingok) /usr/local/3proxy/libexec/SSLPlugin.ld.so +%config(missingok) /usr/local/3proxy/libexec/pamauth.ld.so /usr/local/3proxy/libexec/StringsPlugin.ld.so -/usr/local/3proxy/libexec/pamauth.ld.so /usr/local/3proxy/libexec/TrafficPlugin.ld.so /usr/local/3proxy/libexec/TransparentPlugin.ld.so %if "%{_arch}" == "arm" diff --git a/src/plugins/PamAuth/Makefile.inc b/src/plugins/PamAuth/Makefile.inc index 661c2ed..a15c991 100644 --- a/src/plugins/PamAuth/Makefile.inc +++ b/src/plugins/PamAuth/Makefile.inc @@ -1,8 +1,10 @@ +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)pam$(LIBSSUFFIX) pamauth$(OBJSUFFICS) + $(LN) $(LNOUT)../../$(BUILDDIR)pamauth$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) $(LIBSPREFIX)$(PAMLIB)$(LIBSSUFFIX) pamauth$(OBJSUFFICS)