[ptxdist] [PATCH] glibc: fix typo in Y2038 check

2023-06-07 Thread Ladislav Michl 
From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 Note: The previous commit message had a typo as well...

 rules/glibc.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/glibc.make b/rules/glibc.make
index 0f54bb181..a550f4b92 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -32,7 +32,7 @@ ifdef PTXCONF_GLIBC_Y2038
@echo Checking Y2038 support...
@echo 'static_assert(sizeof(time_t) == 8, "y2038");' | \
$(CROSS_CC) -c -x c -include sys/types.h -include assert.h - 
&>/dev/null || \
-   ptxd_bailout "PTXCONF_GLIBC_Y2038 is enabled but the toolchain 
has no Y2028 support!"
+   ptxd_bailout "PTXCONF_GLIBC_Y2038 is enabled but the toolchain 
has no Y2038 support!"
 endif
@$(call touch)
 
-- 
2.32.0

[ptxdist] [PATCH] xorgproto: Version bump. 2022.2 -> 2023.01

2023-06-07 Thread Christian Melki 
Minor bugfix changes.

Signed-off-by: Christian Melki 
---
 rules/xorgproto.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/xorgproto.make b/rules/xorgproto.make
index 32230ac0e..c5fdd8d3a 100644
--- a/rules/xorgproto.make
+++ b/rules/xorgproto.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XORGPROTO) += xorgproto
 #
 # Paths and names
 #
-XORGPROTO_VERSION  := 2022.2
-XORGPROTO_MD5  := 3fdb11d75f7023db273f7b3e34b58338
+XORGPROTO_VERSION  := 2023.1
+XORGPROTO_MD5  := c1ba00071316114b7dac58a2aa9b81db
 XORGPROTO  := xorgproto-$(XORGPROTO_VERSION)
 XORGPROTO_SUFFIX   := tar.xz
 XORGPROTO_URL  := $(call ptx/mirror, XORG, 
individual/proto/$(XORGPROTO).$(XORGPROTO_SUFFIX))
-- 
2.34.1

[ptxdist] [PATCH v2] ntp: Version bump. 4.2.8p15 -> 4.2.8p17

2023-06-07 Thread Christian Melki 
Bugfix releases.
A few security related but mostly just fixes.
OpenSSL 3.0 support and other bumps.
https://www.ntp.org/support/securitynotice/4_2_8-series-changelog/#428p16
https://www.ntp.org/support/securitynotice/4_2_8-series-changelog/#428p17

* License file changed. A lot of changes to dates, authors and contributors,
but none to the actual license texts.
* Remove patch set. Bug fix is now included in this release.
* Remove obsolete option.
* Enable new bugfixes as configure options.

Signed-off-by: Christian Melki 
---
 ...o-not-use-PTHREAD_STACK_MIN-on-glibc.patch | 29 ---
 patches/ntp-4.2.8p15/series   |  4 ---
 rules/ntp.make|  9 +++---
 3 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 
patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
 delete mode 100644 patches/ntp-4.2.8p15/series

diff --git 
a/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch 
b/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
deleted file mode 100644
index 017b4d41f..0
--- 
a/patches/ntp-4.2.8p15/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Khem Raj 
-Date: Sat, 31 Jul 2021 10:51:41 -0700
-Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
-
-In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
-could mean different stack sizes at runtime on different architectures
-and it also causes compile failure. Default glibc thread stack size
-or 64Kb set by ntp should be good in glibc these days.
-
-Signed-off-by: Khem Raj 
-[Copied from 
https://github.com/openembedded/meta-openembedded/blob/master/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch]
-Signed-off-by: Alexey Brodkin 

- libntp/work_thread.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libntp/work_thread.c b/libntp/work_thread.c
-index 03a5647bea36..3ddd751557e0 100644
 a/libntp/work_thread.c
-+++ b/libntp/work_thread.c
-@@ -41,7 +41,7 @@
- #ifndef THREAD_MINSTACKSIZE
- # define THREAD_MINSTACKSIZE  (64U * 1024)
- #endif
--#ifndef __sun
-+#if !defined(__sun) && !defined(__GLIBC__)
- #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
- # undef THREAD_MINSTACKSIZE
- # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
diff --git a/patches/ntp-4.2.8p15/series b/patches/ntp-4.2.8p15/series
deleted file mode 100644
index 7a2de77a2..0
--- a/patches/ntp-4.2.8p15/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch
-# e85ebd807ca50b5d07918a17d9595773  - git-ptx-patches magic
diff --git a/rules/ntp.make b/rules/ntp.make
index 9bbf9ef49..b813df9db 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NTP) += ntp
 #
 # Paths and names
 #
-NTP_VERSION:= 4.2.8p15
-NTP_MD5:= e1e6b23d2fc75cced41801dbcd6c2561
+NTP_VERSION:= 4.2.8p17
+NTP_MD5:= a15558df580bd1b955a105a8b91c078f
 NTP:= ntp-$(NTP_VERSION)
 NTP_SUFFIX := tar.gz
 NTP_URL:= 
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$(NTP).$(NTP_SUFFIX)
 NTP_SOURCE := $(SRCDIR)/$(NTP).$(NTP_SUFFIX)
 NTP_DIR:= $(BUILDDIR)/$(NTP)
 NTP_LICENSE:= ntp
-NTP_LICENSE_FILES  := file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19
+NTP_LICENSE_FILES  := file://COPYRIGHT;md5=3a8ffebbcad335abf2c39fec38671eec
 
 # 
 # Prepare
@@ -136,6 +136,8 @@ NTP_CONF_OPT:= \
--disable-kernel-fll-bug \
--enable-bug1243-fix \
--enable-bug3020-fix \
+   --enable-bug3527-fix \
+   --enable-bug3767-fix \
--$(call ptx/endis, PTXCONF_NTP_IRIG_SAWTOOTH)-irig-sawtooth \
--$(call ptx/endis, PTXCONF_NTP_NIST)-nist \
--disable-ntp-signd \
@@ -145,7 +147,6 @@ NTP_CONF_OPT:= \
--disable-saveconfig \
--disable-leap-smear \
--disable-dynamic-interleave \
-   --without-gtest \
--disable-problem-tests
 
 # 
-- 
2.34.1

Re: [ptxdist] [PATCH] mailmap: Add a few entries for improved commit statistics

2023-06-07 Thread Alexander Dahl 
Hello Uwe,

Am Wed, Jun 07, 2023 at 03:51:29PM +0200 schrieb Uwe Kleine-König:
> When a single person uses different variants of their real name and
> different email addresses, they appear as different persons in the
> hall of fame in the category "Commits".
> 
> With this .mailmap the number of individual committers is reduced from
> 148 to 141 (as of ptxdist-2023.05.0) as produced by
> 
>   git shortlog -sn

I noticed some more when calling `git shortlog -s` or lets say
omitting '-n' which gives you alphabetic order.  Not sure if those are
the same person, but I would guess so.

 1   Andrej Gantvorg
 1   andrej.gantv...@wago.com

   620   Bjoern Buerger
51   Bjørn Bürger

23   Denis OSTERLAND
22   Denis Osterland-Heim

14   Enrico Joerns
37   Enrico Jorns

11   Guillermo Rodriguez
16   Guillermo Rodríguez
 3   grodriguez

   936   Juergen Beisert
 3   Jürgen Beisert

As said on IRC before, things differ if you additionally pass '-e' …

Greets
Alex

> 
> .
> 
> Signed-off-by: Uwe Kleine-König 
> ---
>  .mailmap | 7 +++
>  1 file changed, 7 insertions(+)
>  create mode 100644 .mailmap
> 
> diff --git a/.mailmap b/.mailmap
> new file mode 100644
> index ..c1c31f0237a0
> --- /dev/null
> +++ b/.mailmap
> @@ -0,0 +1,7 @@
> +Christian Gieseler 
> +Denis Osterland-Heim 
> +Florian Bäuerle 
> +Ladislav Michl 
> +Ladislav Michl 
> +Michael Olbrich 
> +Thorsten Liepert 
> 
> base-commit: 5015bfbd0347abfc20bcf0bfedf5b02670353924
> -- 
> 2.39.2
> 
>

[ptxdist] [PATCH] mailmap: Add a few entries for improved commit statistics

2023-06-07 Thread Uwe Kleine-König 
When a single person uses different variants of their real name and
different email addresses, they appear as different persons in the
hall of fame in the category "Commits".

With this .mailmap the number of individual committers is reduced from
148 to 141 (as of ptxdist-2023.05.0) as produced by

git shortlog -sn

.

Signed-off-by: Uwe Kleine-König 
---
 .mailmap | 7 +++
 1 file changed, 7 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index ..c1c31f0237a0
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Christian Gieseler 
+Denis Osterland-Heim 
+Florian Bäuerle 
+Ladislav Michl 
+Ladislav Michl 
+Michael Olbrich 
+Thorsten Liepert 

base-commit: 5015bfbd0347abfc20bcf0bfedf5b02670353924
-- 
2.39.2

[ptxdist] [PATCH] bbinit: Remove /bin and /sbin from PATH after /usr merge

2023-06-07 Thread Alexander Dahl 
The so called /usr merge was done back with ptxdist-2017.05.0 and since
then /bin is just a symlink to /usr/bin and /sbin just a symlink to
/usr/sbin.  Putting /bin _and_ /usr/bin to PATH would actually put the
same directory twice to PATH.

Signed-off-by: Alexander Dahl 
---

Notes:
Not sure if this should have been RFC first?  This does not affect
PATH set by /etc/profile on login and there are more scripts outside
of /etc/init.d which set a PATH.

 projectroot/etc/init.d/NetworkManager | 2 +-
 projectroot/etc/init.d/atd| 2 +-
 projectroot/etc/init.d/avahi-daemon   | 2 +-
 projectroot/etc/init.d/chrony | 2 +-
 projectroot/etc/init.d/dropbear   | 2 +-
 projectroot/etc/init.d/haveged| 2 +-
 projectroot/etc/init.d/inetd  | 2 +-
 projectroot/etc/init.d/lighttpd   | 2 +-
 projectroot/etc/init.d/lldpd  | 2 +-
 projectroot/etc/init.d/monit  | 2 +-
 projectroot/etc/init.d/nftables   | 2 +-
 projectroot/etc/init.d/ntp-client | 2 +-
 projectroot/etc/init.d/ntp-server | 2 +-
 projectroot/etc/init.d/openssh| 2 +-
 projectroot/etc/init.d/proftpd| 2 +-
 projectroot/etc/init.d/pureftpd   | 2 +-
 projectroot/etc/init.d/rc-once| 2 +-
 projectroot/etc/init.d/samba  | 2 +-
 projectroot/etc/init.d/sysctl | 2 +-
 projectroot/etc/init.d/zeroconf   | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/projectroot/etc/init.d/NetworkManager 
b/projectroot/etc/init.d/NetworkManager
index 50a5467ad..f76e01131 100644
--- a/projectroot/etc/init.d/NetworkManager
+++ b/projectroot/etc/init.d/NetworkManager
@@ -19,7 +19,7 @@ exec_prefix=/usr
 sbindir=${exec_prefix}/sbin
 localstatedir=/var
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
 DESC="network connection manager"
 NAME="NetworkManager"
 
diff --git a/projectroot/etc/init.d/atd b/projectroot/etc/init.d/atd
index 7253f646c..62bfef811 100644
--- a/projectroot/etc/init.d/atd
+++ b/projectroot/etc/init.d/atd
@@ -3,7 +3,7 @@
 #
 # atd
 #
-PATH=/usr/bin:/usr/sbin:/bin:/sbin
+PATH=/usr/bin:/usr/sbin
 
 PREFIX="atd: "
 ATD="/usr/sbin/atd"
diff --git a/projectroot/etc/init.d/avahi-daemon 
b/projectroot/etc/init.d/avahi-daemon
index 27c22cc52..7aadb7525 100644
--- a/projectroot/etc/init.d/avahi-daemon
+++ b/projectroot/etc/init.d/avahi-daemon
@@ -4,7 +4,7 @@
 # Mi 22. Jul 21:46:28 CEST 2009
 
 #set -e
-PATH=/sbin:/bin:/usr/bin
+PATH=/usr/sbin:/usr/bin
 BINARY=/usr/sbin/avahi-daemon
 OPTIONS="-D"
 
diff --git a/projectroot/etc/init.d/chrony b/projectroot/etc/init.d/chrony
index d112927f8..a40e2e621 100644
--- a/projectroot/etc/init.d/chrony
+++ b/projectroot/etc/init.d/chrony
@@ -7,7 +7,7 @@
 # Last change:  Bj�rn B�rger 
 # Date:Tue Mar  6 16:00:30 UTC 2007
 
-PATH=/sbin:/bin:/usr/bin:/usr/sbin
+PATH=/usr/sbin:/usr/bin
 BINARY="/usr/sbin/chronyd"
 CONFIG="/etc/chrony/chrony.conf"
 PREFIX="chrony: "
diff --git a/projectroot/etc/init.d/dropbear b/projectroot/etc/init.d/dropbear
index 1b16de20a..bec330ab2 100644
--- a/projectroot/etc/init.d/dropbear
+++ b/projectroot/etc/init.d/dropbear
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/dropbear
 NAME=dropbear
 
diff --git a/projectroot/etc/init.d/haveged b/projectroot/etc/init.d/haveged
index 1a4fc62a2..14e391320 100755
--- a/projectroot/etc/init.d/haveged
+++ b/projectroot/etc/init.d/haveged
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATH='/sbin:/usr/sbin:/bin:/usr/bin'
+PATH='/usr/sbin:/usr/bin'
 DESC='haveged entropy daemon'
 NAME='haveged'
 DAEMON="/usr/sbin/$NAME"
diff --git a/projectroot/etc/init.d/inetd b/projectroot/etc/init.d/inetd
index 128d41a82..8fb10d994 100644
--- a/projectroot/etc/init.d/inetd
+++ b/projectroot/etc/init.d/inetd
@@ -3,7 +3,7 @@
 # This is an inetd init.d script which ist called by init(1) with [start|stop] 
as argument
 #
 
-PATH=/sbin:/bin:/usr/bin
+PATH=/usr/sbin:/usr/bin
 BINARY=/usr/sbin/inetd
 
 # --- nothing to change after this line ---
diff --git a/projectroot/etc/init.d/lighttpd b/projectroot/etc/init.d/lighttpd
index 24a17e2a0..e1b17c984 100644
--- a/projectroot/etc/init.d/lighttpd
+++ b/projectroot/etc/init.d/lighttpd
@@ -3,7 +3,7 @@
 #
 # lighttpd
 #
-PATH=/usr/bin:/usr/sbin:/bin:/sbin
+PATH=/usr/bin:/usr/sbin
 
 PREFIX="lighttpd: "
 LIGHTTPD="/usr/sbin/lighttpd"
diff --git a/projectroot/etc/init.d/lldpd b/projectroot/etc/init.d/lldpd
index 00c8240f5..a592730fb 100755
--- a/projectroot/etc/init.d/lldpd
+++ b/projectroot/etc/init.d/lldpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
+PATH=/usr/sbin:/usr/bin
 DESC="LLDP daemon"
 NAME=lldpd
 DAEMON=/usr/sbin/$NAME
diff --git a/projectroot/etc/init.d/monit b/projectroot/etc/init.d/monit
index 96ec86ab9..c27543204 100644
--- a/projectroot/etc/init.d/monit
+++ b/projectroot/etc/init.d/monit