Commit: b99de89305916fe5e53b33f5f41afa53236f7b75 - LFScripts (git)

Commit MetaInfo

• Revision: b99de89305916fe5e53b33f5f41afa53236f7b75 (tree)
• Zeit: 2023-04-15 21:47:21
• Autor: matsuand <30614168+matsuand@user...>
• Commiter: matsuand

Log Message

[BLFS] Update.

Ändern Zusammenfassung

• modified: BLFS/apache.sh
• modified: BLFS/apr.sh
• modified: BLFS/fuse.sh
• modified: BLFS/gpgme.sh
• modified: BLFS/install-iptables.sh
• add: BLFS/liblinear.sh
• modified: BLFS/libnetfilter_conntrack.sh
• modified: BLFS/libnl.sh
• modified: BLFS/libpcap.sh
• modified: BLFS/libusb.sh
• add: BLFS/lsof.sh
• modified: BLFS/lua.sh
• modified: BLFS/nmap.sh

Diff

--- a/BLFS/apache.sh
+++ b/BLFS/apache.sh
@@ -3,7 +3,7 @@
 . ./_blfsset.sh
 
 APPNAME=httpd
-VER=2.4.55
+VER=2.4.57
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.tar.bz2
 TARGETDIR=$TARGET

--- a/BLFS/apr.sh
+++ b/BLFS/apr.sh
@@ -3,7 +3,7 @@
 . ./_blfsset.sh
 
 APPNAME=apr
-VER=1.7.2
+VER=1.7.3
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.tar.bz2
 TARGETDIR=$TARGET
@@ -39,7 +39,7 @@ make \
 	1> $LOG/$TARGET.2_make.log 2>&1 || exit 1
 
 Installing
-porg -lp $TARGET "make install" \
+porg -lp $TARGET -E$PWD "make install" \
 	1> $LOG/$TARGET.3_install.log 2>&1 || exit 1
 
 TimeEnd

--- a/BLFS/fuse.sh
+++ b/BLFS/fuse.sh
@@ -3,7 +3,7 @@
 . ./_blfsset.sh
 
 APPNAME=fuse
-VER=3.14.0
+VER=3.14.1
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.tar.xz
 TARGETDIR=$TARGET
@@ -31,7 +31,7 @@ mkdir build
 cd    build
 
 Configuring
-meson --prefix=/usr --buildtype=release .. \
+meson setup --prefix=/usr --buildtype=release .. \
 	1> $LOG/$TARGET.1_conf.log 2>&1 || exit 1
 
 Making

--- a/BLFS/gpgme.sh
+++ b/BLFS/gpgme.sh
@@ -3,7 +3,7 @@
 . ./_blfsset.sh
 
 APPNAME=gpgme
-VER=1.18.0
+VER=1.19.0
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.tar.bz2
 TARGETDIR=$TARGET
@@ -27,13 +27,9 @@ TimeStart
 
 cd $TARGETDIR
 
-sed -e 's/3\.9/3.11/'                    \
-    -e 's/:3/:4/'                        \
-    -i configure
-
-Patching
-patch -Np1 -i $DLD/gpgme-$VER-gpg_error_1_46-1.patch \
-	1> $LOG/$TARGET.0_patch.log 2>&1 || exit 1
+#Patching
+#patch -Np1 -i $DLD/gpgme-$VER-gpg_error_1_46-1.patch \
+#	1> $LOG/$TARGET.0_patch.log 2>&1 || exit 1
 
 Configuring
 ./configure --prefix=/usr --disable-gpg-test \

--- a/BLFS/install-iptables.sh
+++ b/BLFS/install-iptables.sh
@@ -2,9 +2,9 @@
 
 . ./_blfsset.sh
 
-TARGET=blfs-bootscripts-$BOOTSCRIPTDATE
+TARGET=blfs-systemd-units-$BOOTSCRIPTDATE
 SCRIPT=install-iptables
-TARGETBALL=$TARGET.tar.bz2
+TARGETBALL=$TARGET.tar.xz
 TARGETDIR=$TARGET
 
 cd $SRC
@@ -17,10 +17,10 @@ rm -fr $TARGETDIR
 cd $TARGETDIR
 
 echo \ \ Installing...
-paco -p $SCRIPT "make ${SCRIPT}" \
+porg -lp $SCRIPT "make ${SCRIPT}" \
 	1> $LOG/${SCRIPT}_1.install.log 2>&1 || (echo Error occured && exit 1)
 
-echo -n \ \ Pacoing:\   && paco $SCRIPT || echo none
+echo -n \ \ Porging:\   && porg $SCRIPT || echo none
 
 echo \ \ Done.
 

--- /dev/null
+++ b/BLFS/liblinear.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+. ./_blfsset.sh
+
+APPNAME=liblinear
+VER=246
+TARGET=$APPNAME-$VER
+TARGETBALL=$DLD/$TARGET.tar.gz
+TARGETDIR=$TARGET
+
+echo $TARGET
+
+. $WRK/_checkRequired.sh ""
+. $WRK/_checkOptions.sh  ""
+. $WRK/_checkTarball.sh
+. $WRK/_checkExit.sh "$1" || exit $?
+
+cd $SRC
+RemoveSrcDir
+Extract
+
+TimeStart
+
+cd $TARGETDIR
+
+Making
+make lib \
+	1> $LOG/$TARGET.2_make.log 2>&1 || exit 1
+
+Installing
+porg -lp $TARGET "\
+install -vm644 linear.h /usr/include && \
+install -vm755 liblinear.so.5 /usr/lib && \
+ln -sfv liblinear.so.5 /usr/lib/liblinear.so" \
+	1> $LOG/$TARGET.3_install.log 2>&1 || exit 1
+
+TimeEnd
+
+cd ..
+RemoveSrcDir
+PorgingDone
+

--- a/BLFS/libnetfilter_conntrack.sh
+++ b/BLFS/libnetfilter_conntrack.sh
@@ -10,7 +10,8 @@ TARGETDIR=$TARGET
 
 echo $TARGET
 
-. $WRK/_checkRequired.sh ""
+. $WRK/_checkRequired.sh \
+	libmnl libnfnetlink
 . $WRK/_checkOptions.sh  ""
 . $WRK/_checkTarball.sh
 . $WRK/_checkExit.sh "$1" || exit $?

--- a/BLFS/libnl.sh
+++ b/BLFS/libnl.sh
@@ -3,7 +3,7 @@
 . ./_blfsset.sh
 
 APPNAME=libnl
-VER=3.2.25
+VER=3.7.0
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.tar.gz
 TARGETDIR=$TARGET
@@ -11,8 +11,7 @@ TARGETDIR=$TARGET
 echo $TARGET
 
 . $WRK/_checkRequired.sh ""
-. $WRK/_checkOptions.sh  \
-	check
+. $WRK/_checkOptions.sh  ""
 . $WRK/_checkTarball.sh
 . $WRK/_checkExit.sh "$1" || exit $?
 
@@ -34,7 +33,7 @@ make \
 	1> $LOG/$TARGET.2_make.log 2>&1 || exit 1
 
 Installing
-porg -lp  $TARGET "make install" \
+porg -lp  $TARGET -E$PWD "make install" \
 	1> $LOG/$TARGET.3_install.log 2>&1 || exit 1
 
 TimeEnd

--- a/BLFS/libpcap.sh
+++ b/BLFS/libpcap.sh
@@ -3,7 +3,7 @@
 . ./_blfsset.sh
 
 APPNAME=libpcap
-VER=1.10.3
+VER=1.10.4
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.tar.gz
 TARGETDIR=$TARGET

--- a/BLFS/libusb.sh
+++ b/BLFS/libusb.sh
@@ -3,7 +3,7 @@
 . ./_blfsset.sh
 
 APPNAME=libusb
-VER=1.0.21
+VER=1.0.26
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.tar.bz2
 TARGETDIR=$TARGET
@@ -23,8 +23,6 @@ TimeStart
 
 cd $TARGETDIR
 
-sed -i "s/^PROJECT_LOGO/#&/" doc/doxygen.cfg.in
-
 Configuring
 ./configure --prefix=/usr --disable-static \
 	1> $LOG/$TARGET.1_conf.log 2>&1 || exit 1
@@ -34,7 +32,7 @@ make -j1 \
 	1> $LOG/$TARGET.2_make.log 2>&1 || exit 1
 
 Installing
-porg -lp $TARGET "make install" \
+porg -lp $TARGET -E$PWD "make install" \
 	1> $LOG/$TARGET.3_install.log 2>&1 || exit 1
 
 TimeEnd

--- /dev/null
+++ b/BLFS/lsof.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+. ./_blfsset.sh
+
+APPNAME=lsof
+VER=4.95.0
+TARGET=$APPNAME-$VER
+TARGETBALL=$DLD/${APPNAME}_$VER.linux.tar.bz2
+TARGETDIR=${APPNAME}_$VER.linux
+
+echo $TARGET
+
+. $WRK/_checkRequired.sh \
+	libtirpc
+. $WRK/_checkOptions.sh  \
+	nmap
+. $WRK/_checkTarball.sh
+. $WRK/_checkExit.sh "$1" || exit $?
+
+cd $SRC
+RemoveSrcDir
+Extract
+
+TimeStart
+
+cd $TARGETDIR
+
+Configuring
+./Configure -n linux \
+	1> $LOG/$TARGET.1_conf.log 2>&1 || exit 1
+
+Making
+make \
+	1> $LOG/$TARGET.2_make.log 2>&1 || exit 1
+
+Installing
+porg -lp $TARGET "\
+install -v -m4755 -o root -g root lsof /usr/bin" \
+	1> $LOG/$TARGET.3_install.log 2>&1 || exit 1
+porg -lp+ $TARGET "\
+install -v lsof.8 /usr/share/man/man8" \
+	1>> $LOG/$TARGET.3_install.log 2>&1 || exit 1
+
+TimeEnd
+
+cd ..
+RemoveSrcDir
+PorgingDone
+

--- a/BLFS/lua.sh
+++ b/BLFS/lua.sh
@@ -3,7 +3,7 @@
 . ./_blfsset.sh
 
 APPNAME=lua
-VER=5.3.5
+VER=5.4.4
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.tar.gz
 TARGETDIR=$TARGET
@@ -26,8 +26,8 @@ TimeStart
 cd $TARGETDIR
 
 cat > lua.pc << "EOF"
-V=5.3
-R=5.3.5
+V=5.4
+R=5.4.4
 
 prefix=/usr
 INSTALL_BIN=${prefix}/bin
@@ -48,15 +48,12 @@ Libs: -L${libdir} -llua -lm -ldl
 Cflags: -I${includedir}
 EOF
 
-#echo Patching unofficial...
-#patch -Np1 -i $WRK/patch/lua-$VER.patch \
 Patching
-patch -Np1 -i $DLD/lua-$VER-shared_library-1.patch \
+patch -Np1 -i $DLD/lua-$VER-shared_library-2.patch \
 	1> $LOG/$TARGET.0_patch.log 2>&1 || exit 1
-sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h
 
 Making
-make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux \
+make linux \
 	1> $LOG/$TARGET.2_make.log 2>&1 || exit 1
 
 Installing
@@ -64,7 +61,7 @@ porg -lp $TARGET "\
 make INSTALL_TOP=/usr                \
      INSTALL_DATA=\"cp -d\"          \
      INSTALL_MAN=/usr/share/man/man1 \
-     TO_LIB=\"liblua.so liblua.so.5.3 liblua.so.5.3.4\" \
+     TO_LIB=\"liblua.so liblua.so.5.4 liblua.so.5.4.4\" \
      install" \
 	1> $LOG/$TARGET.3_install.log 2>&1 || exit 1
 

--- a/BLFS/nmap.sh
+++ b/BLFS/nmap.sh
@@ -3,7 +3,7 @@
 . ./_blfsset.sh
 
 APPNAME=nmap
-VER=6.25
+VER=7.93
 TARGET=$APPNAME-$VER
 TARGETBALL=$DLD/$TARGET.tar.bz2
 TARGETDIR=$TARGET
@@ -34,12 +34,13 @@ make \
 	1> $LOG/$TARGET.2_make.log 2>&1 || exit 1
 
 Installing
-paco -p $TARGET "make install" \
+porg -lp $TARGET -E$PWD "\
+make install" \
 	1> $LOG/$TARGET.3_install.log 2>&1 || exit 1
 
 TimeEnd
 
 cd ..
 RemoveSrcDir
-PacoingDone
+PorgingDone