Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/dbench.in | 2 +- rules/dbench.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/dbench.in b/rules/dbench.in index 719b8b797c6a..a16b13f002fc 100644 --- a/rules/dbench.in +++ b/rules/dbench.in @@ -16,7 +16,7 @@ menuconfig DBENCH Note that this benchmark is *not* a realistic reflection of normal server load. - http://samba.org/ftp/tridge/dbench/ + https://www.samba.org/ftp/tridge/dbench/ if DBENCH diff --git a/rules/dbench.make b/rules/dbench.make index 15b943aaf7dc..9298ca3c4976 100644 --- a/rules/dbench.make +++ b/rules/dbench.make @@ -18,7 +18,7 @@ DBENCH_VERSION := 3.04 DBENCH_MD5 := efd0c958da79c1cd941ecd3f63e637ae DBENCH := dbench-$(DBENCH_VERSION) DBENCH_SUFFIX := tar.gz -DBENCH_URL := http://samba.org/ftp/tridge/dbench/$(DBENCH).$(DBENCH_SUFFIX) +DBENCH_URL := https://www.samba.org/ftp/tridge/dbench/$(DBENCH).$(DBENCH_SUFFIX) DBENCH_SOURCE := $(SRCDIR)/$(DBENCH).$(DBENCH_SUFFIX) DBENCH_DIR := $(BUILDDIR)/$(DBENCH) DBENCH_LICENSE := GPL-2.0-or-later -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
The old version has been depublished from SourceForge due to CVEs. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/linuxptp.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/linuxptp.make b/rules/linuxptp.make index 7e94cb20dfbd..6415512f1cbc 100644 --- a/rules/linuxptp.make +++ b/rules/linuxptp.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LINUXPTP) += linuxptp # # Paths and names # -LINUXPTP_VERSION := 2.0 -LINUXPTP_MD5 := d8bb7374943bb747db7786ac26f17f11 +LINUXPTP_VERSION := 3.1.1 +LINUXPTP_MD5 := 3b79ab5e77c5b5cf06bc1c8350d405bb LINUXPTP := linuxptp-$(LINUXPTP_VERSION) LINUXPTP_SUFFIX := tgz LINUXPTP_URL := $(call ptx/mirror, SF, linuxptp/$(LINUXPTP).$(LINUXPTP_SUFFIX)) -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/linuxptp.make | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rules/linuxptp.make b/rules/linuxptp.make index 6415512f1cbc..425ba3925a76 100644 --- a/rules/linuxptp.make +++ b/rules/linuxptp.make @@ -23,6 +23,9 @@ LINUXPTP_URL := $(call ptx/mirror, SF, linuxptp/$(LINUXPTP).$(LINUXPTP_SUFFIX)) LINUXPTP_SOURCE := $(SRCDIR)/$(LINUXPTP).$(LINUXPTP_SUFFIX) LINUXPTP_DIR := $(BUILDDIR)/$(LINUXPTP) LINUXPTP_LICENSE := GPL-2.0-or-later +LINUXPTP_LICENSE_FILES := \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://version.c;startline=6;endline=14;md5=89ff91d940b4bc09b6de0300b34a888f # ---------------------------------------------------------------------------- # Prepare -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/ppp.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/ppp.make b/rules/ppp.make index 3c8a57fd9396..e39b87b45dd3 100644 --- a/rules/ppp.make +++ b/rules/ppp.make @@ -20,7 +20,7 @@ PPP_VERSION := 2.4.9 PPP_MD5 := c88153ae3d16ae114152cd3c15c7301d PPP := ppp-$(PPP_VERSION) PPP_SUFFIX := tar.gz -PPP_URL := http://ftp.samba.org/pub/ppp/$(PPP).$(PPP_SUFFIX) +PPP_URL := https://www.samba.org/ftp/pub/ppp/$(PPP).$(PPP_SUFFIX) PPP_SOURCE := $(SRCDIR)/$(PPP).$(PPP_SUFFIX) PPP_DIR := $(BUILDDIR)/$(PPP) PPP_LICENSE := BSD AND GPL-2.0-only -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/rsync.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/rsync.make b/rules/rsync.make index be507916820a..70fdd751ca0d 100644 --- a/rules/rsync.make +++ b/rules/rsync.make @@ -18,7 +18,7 @@ RSYNC_VERSION := 2.6.9 RSYNC_MD5 := 996d8d8831dbca17910094e56dcb5942 RSYNC := rsync-$(RSYNC_VERSION) RSYNC_SUFFIX := tar.gz -RSYNC_URL := http://samba.org/ftp/rsync/src/$(RSYNC).$(RSYNC_SUFFIX) +RSYNC_URL := https://www.samba.org/ftp/rsync/src/$(RSYNC).$(RSYNC_SUFFIX) RSYNC_SOURCE := $(SRCDIR)/$(RSYNC).$(RSYNC_SUFFIX) RSYNC_DIR := $(BUILDDIR)/$(RSYNC) -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/samba.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/samba.in b/rules/samba.in index dd952cbe6e80..c01b28c10921 100644 --- a/rules/samba.in +++ b/rules/samba.in @@ -31,7 +31,7 @@ menuconfig SAMBA Windows operating systems. Samba is freely available under the GNU General Public License - See http://www.samba.org for details. + See https://www.samba.org for details. Note: on a read-only root filesystem this package still requires a writable '/var/lib' and '/var/cache'. -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
The old version has been depublished from SourceForge due to CVEs. The remaining patch has been applied upstream. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- PATCH v2: - remove old patches - resend only this one patch out-of-series, no changes for the rest of the series PATCH v1: https://lore.ptxdist.org/ptxdist/20210708220204.13187-2-rhi@pengutronix.de --- ...Fix-building-with-new-kernel-headers.patch | 54 ------------------- patches/linuxptp-2.0/series | 4 -- rules/linuxptp.make | 4 +- 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch delete mode 100644 patches/linuxptp-2.0/series diff --git a/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch b/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch deleted file mode 100644 index 247a6a353a7d..000000000000 --- a/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Miroslav Lichvar <mlichvar@redhat.com> -Date: Thu, 6 Dec 2018 18:23:44 +0100 -Subject: [PATCH] Fix building with new kernel headers. - -net_tstamp.h in recent kernel versions requires time.h for clockid_t. - -Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com> ---- - clock.c | 2 +- - sk.c | 1 + - timemaster.c | 1 + - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/clock.c b/clock.c -index faf2dea82a5b..9bbcefa5c57c 100644 ---- a/clock.c -+++ b/clock.c -@@ -17,11 +17,11 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - #include <errno.h> -+#include <time.h> - #include <linux/net_tstamp.h> - #include <poll.h> - #include <stdlib.h> - #include <string.h> --#include <time.h> - #include <sys/queue.h> - - #include "address.h" -diff --git a/sk.c b/sk.c -index f18b2bf8732b..386b4c8adf80 100644 ---- a/sk.c -+++ b/sk.c -@@ -18,6 +18,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - #include <errno.h> -+#include <time.h> - #include <linux/net_tstamp.h> - #include <linux/sockios.h> - #include <linux/ethtool.h> -diff --git a/timemaster.c b/timemaster.c -index 4ba921edb902..28c215a2de95 100644 ---- a/timemaster.c -+++ b/timemaster.c -@@ -22,6 +22,7 @@ - #include <errno.h> - #include <libgen.h> - #include <limits.h> -+#include <time.h> - #include <linux/net_tstamp.h> - #include <net/if.h> - #include <signal.h> diff --git a/patches/linuxptp-2.0/series b/patches/linuxptp-2.0/series deleted file mode 100644 index fe0aad8306c3..000000000000 --- a/patches/linuxptp-2.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Fix-building-with-new-kernel-headers.patch -# b102f87ad3ef97777cea9ad16f755ca7 - git-ptx-patches magic diff --git a/rules/linuxptp.make b/rules/linuxptp.make index 7e94cb20dfbd..6415512f1cbc 100644 --- a/rules/linuxptp.make +++ b/rules/linuxptp.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LINUXPTP) += linuxptp # # Paths and names # -LINUXPTP_VERSION := 2.0 -LINUXPTP_MD5 := d8bb7374943bb747db7786ac26f17f11 +LINUXPTP_VERSION := 3.1.1 +LINUXPTP_MD5 := 3b79ab5e77c5b5cf06bc1c8350d405bb LINUXPTP := linuxptp-$(LINUXPTP_VERSION) LINUXPTP_SUFFIX := tgz LINUXPTP_URL := $(call ptx/mirror, SF, linuxptp/$(LINUXPTP).$(LINUXPTP_SUFFIX)) -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
[-- Attachment #1.1: Type: text/plain, Size: 1350 bytes --] Hello Roland, On Fri, Jul 09, 2021 at 12:02:02AM +0200, Roland Hieber wrote: > Signed-off-by: Roland Hieber <rhi@pengutronix.de> I miss the reasoning for this change. What's the benefit? Greets Alex > --- > rules/ppp.make | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rules/ppp.make b/rules/ppp.make > index 3c8a57fd9396..e39b87b45dd3 100644 > --- a/rules/ppp.make > +++ b/rules/ppp.make > @@ -20,7 +20,7 @@ PPP_VERSION := 2.4.9 > PPP_MD5 := c88153ae3d16ae114152cd3c15c7301d > PPP := ppp-$(PPP_VERSION) > PPP_SUFFIX := tar.gz > -PPP_URL := http://ftp.samba.org/pub/ppp/$(PPP).$(PPP_SUFFIX) > +PPP_URL := https://www.samba.org/ftp/pub/ppp/$(PPP).$(PPP_SUFFIX) > PPP_SOURCE := $(SRCDIR)/$(PPP).$(PPP_SUFFIX) > PPP_DIR := $(BUILDDIR)/$(PPP) > PPP_LICENSE := BSD AND GPL-2.0-only > -- > 2.30.2 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 181 bytes --] _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
On Fri, Jul 09, 2021 at 08:59:08AM +0200, Alexander Dahl wrote: > Hello Roland, > > On Fri, Jul 09, 2021 at 12:02:02AM +0200, Roland Hieber wrote: > > Signed-off-by: Roland Hieber <rhi@pengutronix.de> > > I miss the reasoning for this change. What's the benefit? Originally I tried to "fix" it because the nightly urlcheck run failed, but it turned out to be a temporary failure on the samba.org side. Nevertheless, HTTPS provides more security, and the HTTP URL redirects to HTTPS anyway (same for the other patches in this series). - Roland > > Greets > Alex > > > --- > > rules/ppp.make | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/rules/ppp.make b/rules/ppp.make > > index 3c8a57fd9396..e39b87b45dd3 100644 > > --- a/rules/ppp.make > > +++ b/rules/ppp.make > > @@ -20,7 +20,7 @@ PPP_VERSION := 2.4.9 > > PPP_MD5 := c88153ae3d16ae114152cd3c15c7301d > > PPP := ppp-$(PPP_VERSION) > > PPP_SUFFIX := tar.gz > > -PPP_URL := http://ftp.samba.org/pub/ppp/$(PPP).$(PPP_SUFFIX) > > +PPP_URL := https://www.samba.org/ftp/pub/ppp/$(PPP).$(PPP_SUFFIX) > > PPP_SOURCE := $(SRCDIR)/$(PPP).$(PPP_SUFFIX) > > PPP_DIR := $(BUILDDIR)/$(PPP) > > PPP_LICENSE := BSD AND GPL-2.0-only > > -- > > 2.30.2 -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
[-- Attachment #1.1: Type: text/plain, Size: 2426 bytes --] Hello Roland, On Fri, Jul 09, 2021 at 12:50:21PM +0200, Roland Hieber wrote: > On Fri, Jul 09, 2021 at 08:59:08AM +0200, Alexander Dahl wrote: > > Hello Roland, > > > > On Fri, Jul 09, 2021 at 12:02:02AM +0200, Roland Hieber wrote: > > > Signed-off-by: Roland Hieber <rhi@pengutronix.de> > > > > I miss the reasoning for this change. What's the benefit? > > Originally I tried to "fix" it because the nightly urlcheck run failed, > but it turned out to be a temporary failure on the samba.org side. > Nevertheless, HTTPS provides more security, Downloading some public source tarball without any credentials necessary, I'm not convinced about the additional value. > and the HTTP URL redirects > to HTTPS anyway (same for the other patches in this series). Well, I could accept that, saves at least a request. A > > - Roland > > > > > Greets > > Alex > > > > > --- > > > rules/ppp.make | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/rules/ppp.make b/rules/ppp.make > > > index 3c8a57fd9396..e39b87b45dd3 100644 > > > --- a/rules/ppp.make > > > +++ b/rules/ppp.make > > > @@ -20,7 +20,7 @@ PPP_VERSION := 2.4.9 > > > PPP_MD5 := c88153ae3d16ae114152cd3c15c7301d > > > PPP := ppp-$(PPP_VERSION) > > > PPP_SUFFIX := tar.gz > > > -PPP_URL := http://ftp.samba.org/pub/ppp/$(PPP).$(PPP_SUFFIX) > > > +PPP_URL := https://www.samba.org/ftp/pub/ppp/$(PPP).$(PPP_SUFFIX) > > > PPP_SOURCE := $(SRCDIR)/$(PPP).$(PPP_SUFFIX) > > > PPP_DIR := $(BUILDDIR)/$(PPP) > > > PPP_LICENSE := BSD AND GPL-2.0-only > > > -- > > > 2.30.2 > > -- > Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | > Steuerwalder Str. 21 | https://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie) [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 181 bytes --] _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as 926fb4325a6639de9dc669f4991be4f3f57665e4.
Michael
[sent from post-receive hook]
On Tue, 20 Jul 2021 13:48:45 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210708220204.13187-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/dbench.in b/rules/dbench.in
> index 719b8b797c6a..a16b13f002fc 100644
> --- a/rules/dbench.in
> +++ b/rules/dbench.in
> @@ -16,7 +16,7 @@ menuconfig DBENCH
> Note that this benchmark is *not* a realistic
> reflection of normal server load.
>
> - http://samba.org/ftp/tridge/dbench/
> + https://www.samba.org/ftp/tridge/dbench/
>
> if DBENCH
>
> diff --git a/rules/dbench.make b/rules/dbench.make
> index 15b943aaf7dc..9298ca3c4976 100644
> --- a/rules/dbench.make
> +++ b/rules/dbench.make
> @@ -18,7 +18,7 @@ DBENCH_VERSION := 3.04
> DBENCH_MD5 := efd0c958da79c1cd941ecd3f63e637ae
> DBENCH := dbench-$(DBENCH_VERSION)
> DBENCH_SUFFIX := tar.gz
> -DBENCH_URL := http://samba.org/ftp/tridge/dbench/$(DBENCH).$(DBENCH_SUFFIX)
> +DBENCH_URL := https://www.samba.org/ftp/tridge/dbench/$(DBENCH).$(DBENCH_SUFFIX)
> DBENCH_SOURCE := $(SRCDIR)/$(DBENCH).$(DBENCH_SUFFIX)
> DBENCH_DIR := $(BUILDDIR)/$(DBENCH)
> DBENCH_LICENSE := GPL-2.0-or-later
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as ad71ffe3bef2fcd4d40db1a58e328157c13bfc07.
Michael
[sent from post-receive hook]
On Tue, 20 Jul 2021 13:48:46 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210708220204.13187-3-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/linuxptp.make b/rules/linuxptp.make
> index 7e94cb20dfbd..38aa5847e6a7 100644
> --- a/rules/linuxptp.make
> +++ b/rules/linuxptp.make
> @@ -23,6 +23,9 @@ LINUXPTP_URL := $(call ptx/mirror, SF, linuxptp/$(LINUXPTP).$(LINUXPTP_SUFFIX))
> LINUXPTP_SOURCE := $(SRCDIR)/$(LINUXPTP).$(LINUXPTP_SUFFIX)
> LINUXPTP_DIR := $(BUILDDIR)/$(LINUXPTP)
> LINUXPTP_LICENSE := GPL-2.0-or-later
> +LINUXPTP_LICENSE_FILES := \
> + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> + file://version.c;startline=6;endline=14;md5=89ff91d940b4bc09b6de0300b34a888f
>
> # ----------------------------------------------------------------------------
> # Prepare
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as bf88e2417266c920a792138d68e1fc4703341ca8.
Michael
[sent from post-receive hook]
On Tue, 20 Jul 2021 13:48:48 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210708220204.13187-5-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/rsync.make b/rules/rsync.make
> index be507916820a..70fdd751ca0d 100644
> --- a/rules/rsync.make
> +++ b/rules/rsync.make
> @@ -18,7 +18,7 @@ RSYNC_VERSION := 2.6.9
> RSYNC_MD5 := 996d8d8831dbca17910094e56dcb5942
> RSYNC := rsync-$(RSYNC_VERSION)
> RSYNC_SUFFIX := tar.gz
> -RSYNC_URL := http://samba.org/ftp/rsync/src/$(RSYNC).$(RSYNC_SUFFIX)
> +RSYNC_URL := https://www.samba.org/ftp/rsync/src/$(RSYNC).$(RSYNC_SUFFIX)
> RSYNC_SOURCE := $(SRCDIR)/$(RSYNC).$(RSYNC_SUFFIX)
> RSYNC_DIR := $(BUILDDIR)/$(RSYNC)
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as 906284aa83716d30d52b8c4d15664e8bf2f39ff9.
Michael
[sent from post-receive hook]
On Tue, 20 Jul 2021 13:48:49 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210708220204.13187-6-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/samba.in b/rules/samba.in
> index dd952cbe6e80..c01b28c10921 100644
> --- a/rules/samba.in
> +++ b/rules/samba.in
> @@ -31,7 +31,7 @@ menuconfig SAMBA
> Windows operating systems. Samba is freely available under the
> GNU General Public License
>
> - See http://www.samba.org for details.
> + See https://www.samba.org for details.
>
> Note: on a read-only root filesystem this package still requires a
> writable '/var/lib' and '/var/cache'.
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as 4da5f0b864b25018962b3213c8cde1d4f8b645f6.
Michael
[sent from post-receive hook]
On Tue, 20 Jul 2021 13:48:50 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> The old version has been depublished from SourceForge due to CVEs.
> The remaining patch has been applied upstream.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210708221123.21150-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch b/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch
> deleted file mode 100644
> index 247a6a353a7d..000000000000
> --- a/patches/linuxptp-2.0/0001-Fix-building-with-new-kernel-headers.patch
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -From: Miroslav Lichvar <mlichvar@redhat.com>
> -Date: Thu, 6 Dec 2018 18:23:44 +0100
> -Subject: [PATCH] Fix building with new kernel headers.
> -
> -net_tstamp.h in recent kernel versions requires time.h for clockid_t.
> -
> -Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
> ----
> - clock.c | 2 +-
> - sk.c | 1 +
> - timemaster.c | 1 +
> - 3 files changed, 3 insertions(+), 1 deletion(-)
> -
> -diff --git a/clock.c b/clock.c
> -index faf2dea82a5b..9bbcefa5c57c 100644
> ---- a/clock.c
> -+++ b/clock.c
> -@@ -17,11 +17,11 @@
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> - */
> - #include <errno.h>
> -+#include <time.h>
> - #include <linux/net_tstamp.h>
> - #include <poll.h>
> - #include <stdlib.h>
> - #include <string.h>
> --#include <time.h>
> - #include <sys/queue.h>
> -
> - #include "address.h"
> -diff --git a/sk.c b/sk.c
> -index f18b2bf8732b..386b4c8adf80 100644
> ---- a/sk.c
> -+++ b/sk.c
> -@@ -18,6 +18,7 @@
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> - */
> - #include <errno.h>
> -+#include <time.h>
> - #include <linux/net_tstamp.h>
> - #include <linux/sockios.h>
> - #include <linux/ethtool.h>
> -diff --git a/timemaster.c b/timemaster.c
> -index 4ba921edb902..28c215a2de95 100644
> ---- a/timemaster.c
> -+++ b/timemaster.c
> -@@ -22,6 +22,7 @@
> - #include <errno.h>
> - #include <libgen.h>
> - #include <limits.h>
> -+#include <time.h>
> - #include <linux/net_tstamp.h>
> - #include <net/if.h>
> - #include <signal.h>
> diff --git a/patches/linuxptp-2.0/series b/patches/linuxptp-2.0/series
> deleted file mode 100644
> index fe0aad8306c3..000000000000
> --- a/patches/linuxptp-2.0/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Fix-building-with-new-kernel-headers.patch
> -# b102f87ad3ef97777cea9ad16f755ca7 - git-ptx-patches magic
> diff --git a/rules/linuxptp.make b/rules/linuxptp.make
> index 38aa5847e6a7..425ba3925a76 100644
> --- a/rules/linuxptp.make
> +++ b/rules/linuxptp.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LINUXPTP) += linuxptp
> #
> # Paths and names
> #
> -LINUXPTP_VERSION := 2.0
> -LINUXPTP_MD5 := d8bb7374943bb747db7786ac26f17f11
> +LINUXPTP_VERSION := 3.1.1
> +LINUXPTP_MD5 := 3b79ab5e77c5b5cf06bc1c8350d405bb
> LINUXPTP := linuxptp-$(LINUXPTP_VERSION)
> LINUXPTP_SUFFIX := tgz
> LINUXPTP_URL := $(call ptx/mirror, SF, linuxptp/$(LINUXPTP).$(LINUXPTP_SUFFIX))
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
Thanks, applied as 17c29de35e37f47fdb365815ec2dcafdb6ba1bd9.
Michael
[sent from post-receive hook]
On Tue, 20 Jul 2021 13:48:51 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210708220204.13187-4-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/ppp.make b/rules/ppp.make
> index 3c8a57fd9396..e39b87b45dd3 100644
> --- a/rules/ppp.make
> +++ b/rules/ppp.make
> @@ -20,7 +20,7 @@ PPP_VERSION := 2.4.9
> PPP_MD5 := c88153ae3d16ae114152cd3c15c7301d
> PPP := ppp-$(PPP_VERSION)
> PPP_SUFFIX := tar.gz
> -PPP_URL := http://ftp.samba.org/pub/ppp/$(PPP).$(PPP_SUFFIX)
> +PPP_URL := https://www.samba.org/ftp/pub/ppp/$(PPP).$(PPP_SUFFIX)
> PPP_SOURCE := $(SRCDIR)/$(PPP).$(PPP_SUFFIX)
> PPP_DIR := $(BUILDDIR)/$(PPP)
> PPP_LICENSE := BSD AND GPL-2.0-only
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de