Re: [ptxdist] man/ptxdist.1.gz corrupt in ptxdist-2017.07.0
hi, On Thu, Aug 31, 2017 at 07:43:36PM +0200, Alexander Dahl wrote: > On Thu, Aug 31, 2017 at 04:14:24PM +0100, Ian Abbott wrote: > > I don't think anyone has mentioned this yet on the mailing list, but I'm > > sure a few people other than myself will have noticed that the ptxdist man > > page distributed with ptxdist-2017.07.0 is just a gzip-compressed, empty > > file, so the ptxdist "help" command doesn't work. > > I can confirm this. Thanks for the heads up. It looks like rst2man is broken on the machine I used to create that release. And the rule in the Makefile is broken and didn't propagate the error :-/. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] sudo: version bump 1.7.2p6 -> 1.8.20p2
On Monday 04 September 2017 13:13:14 Denis OSTERLAND wrote: > [...] > @@ -58,7 +58,29 @@ SUDO_AUTOCONF = \ > --without-project \ > --without-lecture \ > --with-ignore-dot \ > - --without-pam > + --without-pam \ > + --enable-env-reset \ > + --enable-warnings \ > + --enable-werror \ > + --enable-openssl \ > + --disable-gcrypt \ > + --enable-hardening \ > + --enable-pie \ > + --enable-asan \ > + --enable-poll \ > + --disable-admin-flag \ > + --disable-nls \ > + --enable-static-sudoers \ > + --enable-shared-libutil \ > + --enable-largefile \ > + --disable-kerb5-instance \ > + --without-linux-audit \ > + --without-solaris-audit \ > + --without-sssd \ > + --with-man \ > + --with-mdoc \ > + --without-umask-override \ > + --without-pam-login Don't forget LARGE FILE SUPPORT. Refer my patch "sudo: upgrade to make it large filesystem aware" jb -- Pengutronix e.K. | Juergen Borleis | Industrial Linux Solutions | http://www.pengutronix.de/ | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] sudo: version bump 1.7.2p6 -> 1.8.20p2
Install new libsudo_util and plugins. Update configure command line options. Signed-off-by: Denis Osterland--- .../0001-install-sh-disable-stripping.patch| 29 patches/sudo-1.7.2p6/series| 1 - .../0001-install-sh-disable-stripping.patch| 29 patches/sudo-1.8.20p2/series | 1 + rules/sudo.make| 86 +- 5 files changed, 63 insertions(+), 83 deletions(-) delete mode 100644 patches/sudo-1.7.2p6/0001-install-sh-disable-stripping.patch delete mode 100644 patches/sudo-1.7.2p6/series create mode 100644 patches/sudo-1.8.20p2/0001-install-sh-disable-stripping.patch create mode 100644 patches/sudo-1.8.20p2/series diff --git a/patches/sudo-1.7.2p6/0001-install-sh-disable-stripping.patch b/patches/sudo-1.7.2p6/0001-install-sh-disable-stripping.patch deleted file mode 100644 index c8421a5..000 --- a/patches/sudo-1.7.2p6/0001-install-sh-disable-stripping.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0c293e823cbe169ed09f1be263ff22e57b9d03ef Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Wed, 13 Jan 2010 09:29:27 +0100 -Subject: [PATCH] install-sh: disable stripping - -This patch disables stripping because the install-sh would use -/usr/bin/strip which doesn't work during cross compilation. - -Signed-off-by: Marc Kleine-Budde - install-sh |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/install-sh b/install-sh -index 5a6d399..e9a70b5 100755 a/install-sh -+++ b/install-sh -@@ -138,7 +138,7 @@ while ${MORETODO} ; do - fi - ;; - X-s) -- STRIPIT=true -+ STRIPIT=false - ;; - X--) - shift --- -1.6.6 - diff --git a/patches/sudo-1.7.2p6/series b/patches/sudo-1.7.2p6/series deleted file mode 100644 index fab2261..000 --- a/patches/sudo-1.7.2p6/series +++ /dev/null @@ -1 +0,0 @@ -0001-install-sh-disable-stripping.patch diff --git a/patches/sudo-1.8.20p2/0001-install-sh-disable-stripping.patch b/patches/sudo-1.8.20p2/0001-install-sh-disable-stripping.patch new file mode 100644 index 000..c8421a5 --- /dev/null +++ b/patches/sudo-1.8.20p2/0001-install-sh-disable-stripping.patch @@ -0,0 +1,29 @@ +From 0c293e823cbe169ed09f1be263ff22e57b9d03ef Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde +Date: Wed, 13 Jan 2010 09:29:27 +0100 +Subject: [PATCH] install-sh: disable stripping + +This patch disables stripping because the install-sh would use +/usr/bin/strip which doesn't work during cross compilation. + +Signed-off-by: Marc Kleine-Budde +--- + install-sh |2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/install-sh b/install-sh +index 5a6d399..e9a70b5 100755 +--- a/install-sh b/install-sh +@@ -138,7 +138,7 @@ while ${MORETODO} ; do + fi + ;; + X-s) +- STRIPIT=true ++ STRIPIT=false + ;; + X--) + shift +-- +1.6.6 + diff --git a/patches/sudo-1.8.20p2/series b/patches/sudo-1.8.20p2/series new file mode 100644 index 000..fab2261 --- /dev/null +++ b/patches/sudo-1.8.20p2/series @@ -0,0 +1 @@ +0001-install-sh-disable-stripping.patch diff --git a/rules/sudo.make b/rules/sudo.make index c9ba61c..e4032ef 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_SUDO) += sudo # # Paths and names # -SUDO_VERSION := 1.7.2p6 -SUDO_MD5 := c4f1a43e8ba94f6bf06d2211442148c4 +SUDO_VERSION := 1.8.20p2 +SUDO_MD5 := 03da8e711caca6fd93e57751bfb74adc SUDO := sudo-$(SUDO_VERSION) SUDO_SUFFIX:= tar.gz SUDO_URL := \ @@ -58,7 +58,29 @@ SUDO_AUTOCONF = \ --without-project \ --without-lecture \ --with-ignore-dot \ - --without-pam + --without-pam \ + --enable-env-reset \ + --enable-warnings \ + --enable-werror \ + --enable-openssl \ + --disable-gcrypt \ + --enable-hardening \ + --enable-pie \ + --enable-asan \ + --enable-poll \ + --disable-admin-flag \ + --disable-nls \ + --enable-static-sudoers \ + --enable-shared-libutil \ + --enable-largefile \ + --disable-kerb5-instance \ + --without-linux-audit \ + --without-solaris-audit \ + --without-sssd \ + --with-man \ + --with-mdoc \ + --without-umask-override \ + --without-pam-login ifdef PTXCONF_SUDO_USE_SENDMAIL SUDO_AUTOCONF += --with-sendmail @@ -76,54 +98,6 @@ else SUDO_AUTOCONF += --without-env-editor endif -# --disable-root-mailer Don't run the mailer as root, run as the user -# --disable-setreuid Don't try to use the setreuid() function -# --disable-setresuid Don't try to use the setresuid() function -# --enable-shell-sets-home set $HOME to target user in shell mode -# --with-AFS enable AFS support -#
Re: [ptxdist] [PATCH 05/19] host-imx-cst: version bump 2.3.1 -> 2.3.2
Hi Clemens, as far as I know, this will require a change in Barebox scripts/imx/imx-image.c, because in this version it expects input file as command line option and does not understand piped input anymore. This is how I deal with this issue, but it wont work with both versions. From: Denis OsterlandDate: Thu, 18 May 2017 07:40:48 +0200 Subject: [PATCH] imx-image: Adapt command line of cst call to match changed cli. Current version 2.3.2 of freescales code-sign-tool expects '-i file' instead of stdin. --- scripts/imx/imx-image.c | 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c index dd57994b..ed3f4ffa50c3 100644 --- a/scripts/imx/imx-image.c +++ b/scripts/imx/imx-image.c @@ -517,7 +517,7 @@ static int nop(const struct config_data *data) static int hab_sign(struct config_data *data) { int fd, outfd, ret, lockfd; - char *csffile, *command; + char *csffile, *command, *csfinput; struct stat s; char *cst; void *buf; @@ -530,6 +530,10 @@ static int hab_sign(struct config_data *data) if (ret < 0) exit(1); + ret = asprintf(, "%s.csf", data->outfile); + if (ret < 0) + exit(1); + ret = stat(csffile, ); if (!ret) { if (S_ISREG(s.st_mode)) { @@ -546,7 +550,7 @@ static int hab_sign(struct config_data *data) } } - ret = asprintf(, "%s -o %s", cst, csffile); + ret = asprintf(, "%s -o %s -i %s", cst, csffile, csfinput); if (ret < 0) return -ENOMEM; @@ -568,15 +572,20 @@ static int hab_sign(struct config_data *data) return -errno; } - FILE *f = popen(command, "w"); + FILE *f = fopen(csfinput, "w"); if (!f) { - perror("popen"); + perror("fopen"); return -errno; } fwrite(data->csf, 1, strlen(data->csf) + 1, f); - pclose(f); + fclose(f); + + ret = system(command); + if (ret) { + exit(ret); + } flock(lockfd, LOCK_UN); close(lockfd); Am Freitag, den 01.09.2017, 18:39 +0200 schrieb Clemens Gruber: > Signed-off-by: Clemens Gruber > --- > rules/host-imx-cst.make | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/rules/host-imx-cst.make b/rules/host-imx-cst.make > index b5aad5aee..dc2a17f4a 100644 > --- a/rules/host-imx-cst.make > +++ b/rules/host-imx-cst.make > @@ -16,8 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_IMX_CST) += host-imx-cst > # > # Paths and names > # > -HOST_IMX_CST_VERSION := 2.3.1 > -HOST_IMX_CST_MD5 := 01684a853e9245dbd6db42acad5861dd > +HOST_IMX_CST_VERSION := 2.3.2 > +HOST_IMX_CST_MD5 := a81766cab2e184ab12e459c0476f6639 > HOST_IMX_CST := cst-$(HOST_IMX_CST_VERSION) > HOST_IMX_CST_SUFFIX := tar.gz > HOST_IMX_CST_URL := > https://www.nxp.com/webapp/sps/download/license.jsp?colCode=IMX_CST_TOOL Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner (Mitglied) Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 – Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier ___ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. ___ ptxdist mailing list ptxdist@pengutronix.de