summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--repo/system/networkmanager.xibuild3
-rw-r--r--repo/system/nss.xibuild50
-rw-r--r--repo/system/polkit.xibuild4
3 files changed, 53 insertions, 4 deletions
diff --git a/repo/system/networkmanager.xibuild b/repo/system/networkmanager.xibuild
index c825177..1f6ccf2 100644
--- a/repo/system/networkmanager.xibuild
+++ b/repo/system/networkmanager.xibuild
@@ -59,8 +59,7 @@ cat > $PKG_DEST/etc/NetworkManager/conf.d/dhcp.conf << "EOF"
dhcp=dhclient
EOF
-# TODO add boot scripts
-
+ cd ..
tar xf $BOOTSCRIPTS.tar.xz
cd $BOOTSCRIPTS
make DESTDIR=$PKG_DEST install-networkmanager
diff --git a/repo/system/nss.xibuild b/repo/system/nss.xibuild
new file mode 100644
index 0000000..46d3dad
--- /dev/null
+++ b/repo/system/nss.xibuild
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+MAKEDEPS=(make gyp perl mercurial python)
+DEPS=(nspr libp11-kit bash zlib)
+
+PKG_VER=3.74
+
+SOURCE=https://archive.mozilla.org/pub/security/nss/releases/NSS_$(echo $PKG_VER | sed 's/\./_/g')_RTM/src/nss-$PKG_VER.tar.gz
+ADDITIONAL=(
+ https://www.linuxfromscratch.org/patches/blfs/svn/nss-$PKG_VER-standalone-1.patch
+ )
+
+DESC="Network Security Services"
+
+prepare () {
+ patch -Np1 -i nss-$PKG_VER-standalone-1.patch
+}
+
+build () {
+ cd nss &&
+
+ make BUILD_OPT=1 \
+ NSPR_INCLUDE_DIR=/usr/include/nspr \
+ USE_SYSTEM_ZLIB=1 \
+ ZLIB_LIBS=-lz \
+ NSS_ENABLE_WERROR=0 \
+ $([ $(uname -m) = x86_64 ] && echo USE_64=1) \
+ $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1)
+
+}
+
+package () {
+ cd ../dist
+ mkdir -pv $PKG_DEST/usr/{lib/pkgconfig,bin,include/nss,}
+
+ install -v -m755 Linux*/lib/*.so $PKG_DEST/usr/lib
+ install -v -m644 Linux*/lib/{*.chk,libcrmf.a} $PKG_DEST/usr/lib
+
+ install -v -m755 -d $PKG_DEST/usr/include/nss
+ cp -v -RL {public,private}/nss/* $PKG_DEST/usr/include/nss
+ chmod -v 644 $PKG_DEST/usr/include/nss/*
+
+ install -v -m755 Linux*/bin/{certutil,nss-config,pk12util} $PKG_DEST/usr/bin
+
+ install -v -m644 Linux*/lib/pkgconfig/nss.pc $PKG_DEST/usr/lib/pkgconfig
+
+ ln -sfv ./pkcs11/p11-kit-trust.so $PKG_DEST/usr/lib/libnssckbi.so
+
+
+}
diff --git a/repo/system/polkit.xibuild b/repo/system/polkit.xibuild
index eb9c2f6..407cb5c 100644
--- a/repo/system/polkit.xibuild
+++ b/repo/system/polkit.xibuild
@@ -52,7 +52,7 @@ EOF
}
postinstall() {
- groupadd -fg 27 polkitd &&
- useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27 \
+ /usr/sbin/groupadd -fg 27 polkitd &&
+ /usr/sbin/useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27 \
-g polkitd -s /bin/false polkitd
}