From 02a07b1846dd61be1df300f345143e5462caa7ae Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 23 Feb 2018 16:05:32 +0100 Subject: building up to libarchive --- i486-stage2/libtirpc/DESCR | 5 ++ i486-stage2/pam/DESCR | 21 +++++++ i486-stage2/pam/pam-1.3.0-unix-passwd-no-yp.patch | 67 +++++++++++++++++++++++ i486-stage2/pkg-config/DESCR | 4 ++ i486-stage2/util-linux/DESCR | 21 +++++++ 5 files changed, 118 insertions(+) create mode 100644 i486-stage2/libtirpc/DESCR create mode 100644 i486-stage2/pam/DESCR create mode 100644 i486-stage2/pam/pam-1.3.0-unix-passwd-no-yp.patch create mode 100644 i486-stage2/pkg-config/DESCR create mode 100644 i486-stage2/util-linux/DESCR (limited to 'i486-stage2') diff --git a/i486-stage2/libtirpc/DESCR b/i486-stage2/libtirpc/DESCR new file mode 100644 index 0000000..b6b3568 --- /dev/null +++ b/i486-stage2/libtirpc/DESCR @@ -0,0 +1,5 @@ +# disable Kerberos +sed -i "/depends=/s/'krb5'//" PKGBUILD + +# gssapi seems also to be a dependency, not in PKBUILD, disable it +sed -i 's@./configure@./configure --disable-gssapi@g' PKGBUILD diff --git a/i486-stage2/pam/DESCR b/i486-stage2/pam/DESCR new file mode 100644 index 0000000..b2c19a2 --- /dev/null +++ b/i486-stage2/pam/DESCR @@ -0,0 +1,21 @@ +# disable NIS/YP +sed -i 's@./configure@./configure --disable-nis@g' PKGBUILD + +# no w3m, docboox-xml/xsl +# tons of tools needed to build documentation, we ommit the documentation right now +sed -i "/makedepends=/s/'w3m'//" PKGBUILD +sed -i "/makedepends=/s/'docbook-xml.*'//" PKGBUILD +sed -i "/makedepends=/s/'docbook-xsl'//" PKGBUILD + +# unix_passwd.c:56:10: fatal error: rpcsvc/yp_prot.h: No such file or directory +# #include +# => pam-1.3.0-unix-passwd-no-yp.patch +sed -i 's@source=(@source=(pam-1.3.0-unix-passwd-no-yp.patch @' PKGBUILD +sed -i "s@md5sums=(@md5sums=('3f5edd685cdd2c0a2ca44bc6e75320d8' @" PKGBUILD +sed -i '/patch -Np/ a \ patch -Np1 -i "${srcdir}/pam-1.3.0-unix-passwd-no-yp.patch"' PKGBUILD + +# disable docu rebuilding +sed -i 's@./configure@./configure --disable-regenerate-docu@' PKGBUILD + +# no documentation built, so nothing to remove +sed -i '2!N; /# FS #40749\n \+rm/ s/rm/#rm/g' PKGBUILD diff --git a/i486-stage2/pam/pam-1.3.0-unix-passwd-no-yp.patch b/i486-stage2/pam/pam-1.3.0-unix-passwd-no-yp.patch new file mode 100644 index 0000000..1ac4a11 --- /dev/null +++ b/i486-stage2/pam/pam-1.3.0-unix-passwd-no-yp.patch @@ -0,0 +1,67 @@ +diff -rauN pam_unix2-2.9.1/config.h.in pam_unix2-2.9.1-unix-passwd-no-yp-patch/config.h.in +--- pam_unix2-2.9.1/config.h.in 2012-04-03 15:31:24.000000000 +0200 ++++ pam_unix2-2.9.1-unix-passwd-no-yp-patch/config.h.in 2017-12-08 16:15:09.870000003 +0100 +@@ -194,3 +194,6 @@ + + /* Define to 1 if you need to in order for `stat' and other things to work. */ + #undef _POSIX_SOURCE ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_RPCSVC_YP_PROT_H +diff -rauN pam_unix2-2.9.1/configure.in pam_unix2-2.9.1-unix-passwd-no-yp-patch/configure.in +--- pam_unix2-2.9.1/configure.in 2012-04-03 15:31:17.000000000 +0200 ++++ pam_unix2-2.9.1-unix-passwd-no-yp-patch/configure.in 2017-12-08 16:15:22.160000000 +0100 +@@ -60,6 +60,7 @@ + AC_CHECK_HEADERS(crypt.h) + AC_CHECK_HEADERS(stdlib.h pwd.h sys/types.h syslog.h sys/syslog.h string.h strings.h, , AC_MSG_ERROR(some basic headers are missing)) + AC_CHECK_HEADERS(security/pam_appl.h security/pam_modules.h, , AC_MSG_ERROR(broken libpam installation)) ++AC_CHECK_HEADERS(rpcsvc/yp_prot.h) + + dnl Check for Linux-PAM 0.99.x + AC_CHECK_HEADERS(security/pam_ext.h) +diff -rauN pam_unix2-2.9.1/src/unix_passwd.c pam_unix2-2.9.1-unix-passwd-no-yp-patch/src/unix_passwd.c +--- pam_unix2-2.9.1/src/unix_passwd.c 2012-04-03 15:24:51.000000000 +0200 ++++ pam_unix2-2.9.1-unix-passwd-no-yp-patch/src/unix_passwd.c 2017-12-08 16:15:33.389999993 +0100 +@@ -53,8 +53,10 @@ + #include + #include + #include ++#if defined(HAVE_YP_PROT_H) + #include + #include ++#endif + + #define PAM_SM_PASSWORD + #include +@@ -413,6 +415,7 @@ + } + } + ++#if defined(HAVE_YP_PROT_H) + static char * + getnismaster (pam_handle_t *pamh, int flags) + { +@@ -445,6 +448,7 @@ + + return master; + } ++#endif + + static int + read_loop (int fd, char *buffer, int count) +@@ -1095,6 +1099,7 @@ + + ulckpwdf (); + } ++#if defined(HAVE_YP_PROT_H) + else if (data->service == S_YP) + { + struct yppasswd yppwd; +@@ -1137,6 +1142,7 @@ + retval = PAM_AUTHTOK_ERR; + } + } ++#endif + + return retval; + } diff --git a/i486-stage2/pkg-config/DESCR b/i486-stage2/pkg-config/DESCR new file mode 100644 index 0000000..2396ff1 --- /dev/null +++ b/i486-stage2/pkg-config/DESCR @@ -0,0 +1,4 @@ +# use internal glib as we cannot possibly have meson build glib! +sed -i "/makedepends=/s/'glib2'//" PKGBUILD +sed -i "/depends=/s/'glib2'//" PKGBUILD +sed -i "s@./configure@./configure --with-internal-glib@g" PKGBUILD diff --git a/i486-stage2/util-linux/DESCR b/i486-stage2/util-linux/DESCR new file mode 100644 index 0000000..93cfeab --- /dev/null +++ b/i486-stage2/util-linux/DESCR @@ -0,0 +1,21 @@ +# install two packages: libutil-linux and util-linux +ADDITIONAL_INSTALL_PACKAGE=libutil-linux + +# disable some dependencies on systemd, python, libcap-ng +sed -i "/makedepends=/s/'systemd'//" PKGBUILD +sed -i "/makedepends=/s/'python'//" PKGBUILD +sed -i "/makedepends=/s/'libcap-ng'//" PKGBUILD +sed -i "/depends=/s/'libsystemd'//" PKGBUILD +sed -i "/depends=/s/'libcap-ng'//" PKGBUILD + +# no python +sed -i 's@--with-python=3@--without-python \\@g' PKGBUILD + +# no systemd +sed -i '/--without-python/ a \ --without-systemd --without-systemdsystemunitdir' PKGBUILD +sed -i "s@\(sed.*\)@#\1@" PKGBUILD +# TODO: needed? +# sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket" + +# tty group for util-linux, later, systemd will have the group already +# we do this in prepare_stage2_repo.sh -- cgit v1.2.3-54-g00ecf