чување 44b9b5b95cda64c9e0bb394a5f97d69d029af111
родитељ 831d0a6fa006a753af360237b8fc1bdbbaf99a67
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Sat, 17 Sep 2022 21:16:54 +0200
Fix bootstrap scripts for later mbsync: fix GnuPG build, fix smdev permissions, fix getty to not override chmod/chown on /dev/tty*
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 5, додавања: 28(+), брисања: 10(-)
diff --git a/03-packages.sh b/03-packages.sh
@@ -6668,7 +6668,7 @@ mkpk_name()
mkpk_install()
{
CFLAGS='-Os -pipe -static --static -fcommon -fPIC'
- LDFLAGS='-static --static -fcommon -s'
+ LDFLAGS='-static --static -fcommon -zmuldefs'
PREFIX=''
DESTDIR=/build
export CFLAGS LDFLAGS PREFIX DESTDIR
@@ -6679,17 +6679,17 @@ mkpk_install()
# ,--- This is why pkg-config sucks: static linking requires to manually
# | add dependencies of dependencies. It is cleaner to just add
# v everything manually from the get-go.
- LDLIBS='-ltasn -lnettle' \\
+ LIBS="\$(pkg-config --libs --static gnutls) -lffi" \\
./configure --prefix="\${PREFIX}" \\
- --enable-symcryptrun \\
--sysconfdir=/etc \\
+ --disable-scdaemon \\
--localstatedir=/var \\
--docdir=/share/doc/${pkg} \\
--disable-nls \\
--enable-bzip2 || exit 1
make ${JN} || exit 1
- make install
+ make install-strip
}
!
mkpk ${pkg}
@@ -6720,7 +6720,7 @@ mkpk_name()
mkpk_install()
{
CFLAGS='-Os -pipe -static --static -fcommon -fPIC'
- LDFLAGS='-static --static -fcommon -s'
+ LDFLAGS='-static --static -fcommon'
PREFIX=''
DESTDIR=/build
export CFLAGS LDFLAGS PREFIX DESTDIR
diff --git a/04-finale.sh b/04-finale.sh
@@ -189,6 +189,8 @@ else
cd_or_fail ${G_SRC}/${pkg}
apply_patch finale -Np1 -i \
+ ${G_PAT}/ubase-galeb/getty_dont_chmod_chown.patch
+ apply_patch finale -Np1 -i \
${G_PAT}/ubase-galeb/getty_show_issue.patch
apply_patch finale -Np1 -i \
${G_PAT}/ubase-galeb/login-proper-login-shell-\
diff --git a/pat/smdev-galeb/smdev-config_h.patch b/pat/smdev-galeb/smdev-config_h.patch
@@ -21,9 +21,9 @@
- { "tty[0-9]", "root", "root", 0600, NULL, NULL },
- { "tty[0-9][0-9]","root", "tty", 0660, NULL, NULL },
- { "ttyS[0-9]*", "root", "tty", 0660, NULL, NULL, },
-+ { "tty[0-9]", "root", "tty", 0640, NULL, NULL },
-+ { "tty[0-9][0-9]","root", "tty", 0640, NULL, NULL },
-+ { "ttyS[0-9]*", "root", "tty", 0640, NULL, NULL, },
++ { "tty[0-9]", "root", "tty", 0660, NULL, NULL },
++ { "tty[0-9][0-9]","root", "tty", 0660, NULL, NULL },
++ { "ttyS[0-9]*", "root", "tty", 0660, NULL, NULL, },
{ "pty.*", "root", "tty", 0660, NULL, NULL },
{ "vcs[0-9]*", "root", "tty", 0660, NULL, NULL },
{ "vcsa*[0-9]*", "root", "tty", 0660, NULL, NULL },
diff --git a/pat/smdev-phkr/smdev-config_h.patch b/pat/smdev-phkr/smdev-config_h.patch
@@ -40,8 +40,8 @@
+ { "console", "root", "tty", 0600, NULL, NULL },
+ { "pty.*", "root", "tty", 0660, NULL, NULL },
+ { "ptmx", "root", "tty", 0666, NULL, NULL },
-+ { "tty", "root", "tty", 0666, NULL, NULL },
-+ { "tty[0-9]", "root", "tty", 0600, NULL, NULL },
++ { "tty", "root", "tty", 0660, NULL, NULL },
++ { "tty[0-9]", "root", "tty", 0660, NULL, NULL },
+ { "tty[0-9][0-9]", "root", "tty", 0660, NULL, NULL },
+ { "vcs*[0-9].*", "root", "tty", 0660, NULL, NULL },
+ // serial
diff --git a/pat/ubase-galeb/getty_dont_chmod_chown.patch b/pat/ubase-galeb/getty_dont_chmod_chown.patch
@@ -0,0 +1,16 @@
+--- a/getty.c 2022-09-17 20:25:04.537665556 +0200
++++ b/getty.c 2022-09-17 20:25:52.641199731 +0200
+@@ -76,10 +76,11 @@
+ dup2(fd, 0);
+ dup2(fd, 1);
+ dup2(fd, 2);
+- if (fchown(fd, 0, 0) < 0)
++ /* smdev will handle this, thank you */
++ /*if (fchown(fd, 0, 0) < 0)
+ weprintf("fchown %s:", tty);
+ if (fchmod(fd, 0600) < 0)
+- weprintf("fchmod %s:", tty);
++ weprintf("fchmod %s:", tty);*/
+ if (fd > 2)
+ close(fd);
+
