script updates/fixes

This commit is contained in:
K D Hedger
2022-09-22 12:37:02 +01:00
parent e20e3cf7b3
commit ac22b29816
6 changed files with 23 additions and 12 deletions

3
.gitignore vendored
View File

@ -15,4 +15,5 @@ LFSPkgBuildScripts/system/system-meta/system-meta.LFSBuild
LFSPkgBuildScripts/kernel/config*
Updating/uplist
HOLD
LFSPkgBuildScripts/testing
LFSPkgBuildScripts/testing
LFSPkgBuildScripts/admin/LFSPkg/master.zip

View File

@ -11,7 +11,7 @@ fi
PKGNAME="libarchive"
TARNAME="$PKGNAME"
VERSION="3.5.1"
VERSION="3.6.1"
BUILD=${BUILD:-1}
SECTION="LIBS"
SUFFIX="LFSPKG"
@ -21,7 +21,7 @@ DOWHAT=${1:-"build"}
CWD=$(pwd)
scriptLog "${PKGNAME}-${VERSION}"
gettar "https://github.com/libarchive/libarchive/releases/download/${VERSION}/${TARBALL}" $SECTION
gettar "https://github.com/libarchive/libarchive/releases/download/v${VERSION}/${TARBALL}" $SECTION
rm -rf "$PKG" || true
mkdir -p "$PKG"
@ -29,6 +29,7 @@ mkdir -p "$PKG"
pushd $COMPILEAT 2>/dev/null||true
extractarchive "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
pushd "${TARNAME}-${VERSION}"
sed '/linux\/fs\.h/d' -i libarchive/archive_read_disk_posix.c
CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure ${CONFIGOPTIONS}
make $MAKEFLAGS||make|| exit 100
make install DESTDIR=$PKG || exit 100
@ -58,3 +59,6 @@ pushd $COMPILEAT 2>/dev/null||true
rm -r "$PKG" "${TARNAME}-${VERSION}"
popd 2>/dev/null||true

View File

@ -4,7 +4,7 @@
trap 'echo -e "$0 ${RED}FAILED${NORMAL} at line ${GREEN}${LINENO}${NORMAL}"' ERR
DEPENDS="Cyrus-SASL-2.1.27 openssl-1.1.1"
DEPENDS="Cyrus-SASL-2.1.27"
if ! lfspkg -B "$DEPENDS";then
exit 100
fi
@ -73,3 +73,4 @@ pushd $COMPILEAT 2>/dev/null||true
rm -r "$PKG" "${TARNAME}-${VERSION}"
popd 2>/dev/null||true

View File

@ -28,14 +28,14 @@ mkdir -p "$PKG"
pushd $COMPILEAT 2>/dev/null||true
extractarchive "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
pushd "${TARNAME}-${VERSION}"
CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure ${CONFIGOPTIONS} --sbindir=/usr/sbin --without-tcp-wrappers --disable-nfsv4 --disable-gss --disable-ipv6
CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure ${CONFIGOPTIONS} --sbindir=/sbin --without-tcp-wrappers --disable-nfsv4 --disable-gss --disable-ipv6
make $MAKEFLAGS||make|| exit 100
make install DESTDIR=$PKG || exit 100
mkdir -vp $PKG/var/lib/nfs||true
chmod u+w,go+r $PKG/sbin/mount.nfs
chown nobody.nogroup $PKG/var/lib/nfs
mkdir -vp ${PKG}/sbin
ln -sv /usr/sbin/rpc.statd ${PKG}/sbin/rpc.statd
#ln -sv /usr/sbin/rpc.statd ${PKG}/sbin/rpc.statd
popd
checketc "$PKG"
@ -62,3 +62,5 @@ pushd $COMPILEAT 2>/dev/null||true
rm -r "$PKG" "${TARNAME}-${VERSION}"
popd 2>/dev/null||true

View File

@ -35,12 +35,9 @@ pushd $COMPILEAT 2>/dev/null||true
pushd "${TARNAME}-${VERSION}"
sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c
patch -Np1 -i ${SOURCEARCHIVES}/${SECTION}/${PKGNAME}-${VERSION}-vulnerability_fixes-1.patch
CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure ${CONFIGOPTIONS} --bindir=/usr/sbin --with-rpcuser=root --enable-warmstarts $SYSTEMDOPTS
CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure ${CONFIGOPTIONS} --bindir=/sbin --sbindir=/sbin --with-rpcuser=root --enable-warmstarts $SYSTEMDOPTS
make $MAKEFLAGS||make|| exit 100
make install DESTDIR=$PKG || exit 100
mkdir -vp $PKG/etc $PKG/sbin|| true
#fix sysv script from blfs bootscripts
ln -sv /usr/sbin/rpcbind $PKG/sbin/rpcbind
popd
checketc "$PKG"
@ -67,3 +64,5 @@ pushd $COMPILEAT 2>/dev/null||true
rm -r "$PKG" "${TARNAME}-${VERSION}"
popd 2>/dev/null||true

View File

@ -4,7 +4,7 @@
trap 'echo -e "$0 ${RED}FAILED${NORMAL} at line ${GREEN}${LINENO}${NORMAL}"' ERR
DEPENDS="libtirpc-1.3.1 Jansson-2.13.1 lmdb-0.9.28 rpcsvc-proto-1.4.2 Linux-PAM-1.5.1 GnuTLS-3.7.0 Parse-Yapp-1.21"
DEPENDS="libtirpc-1.3.1 Jansson-2.13.1 lmdb-0.9.28 rpcsvc-proto-1.4.2 Linux-PAM-1.5.1 GnuTLS-3.7.0 Parse-Yapp-1.21 libarchive-3.6.1 openldap-2.4.57"
if ! lfspkg -B "$DEPENDS";then
exit 100
fi
@ -35,7 +35,7 @@ pushd $COMPILEAT 2>/dev/null||true
extractarchive "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
pushd "${TARNAME}-${VERSION}"
echo "^samba4.rpc.echo.*on.*ncacn_np.*with.*object.*nt4_dc" >> selftest/knownfail
CFLAGS="-I/usr/include/tirpc $LFSFLAGS" LDFLAGS="-ltirpc" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-piddir=/run/samba --with-pammodulesdir=/lib/security --enable-fhs --without-ad-dc $SYSTEMDOPTS --enable-selftest
CFLAGS="-I/usr/include/tirpc $LFSFLAGS" LDFLAGS="-ltirpc" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-piddir=/run/samba --with-pammodulesdir=/lib/security --enable-fhs --without-ad-dc $SYSTEMDOPTS --enable-selftest --with-shared-modules=!vfs_snapper
make $MAKEFLAGS||make|| exit 100
make install DESTDIR=$PKG || exit 100
@ -79,3 +79,7 @@ pushd $COMPILEAT 2>/dev/null||true
rm -r "$PKG" "${TARNAME}-${VERSION}"
popd 2>/dev/null||true