[ptxdist] [PATCH 5/7] liboping: version bump 1.6.2 -> 1.9.0
Signed-off-by: Clemens Gruber --- rules/liboping.make | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/liboping.make b/rules/liboping.make index 596a8d067..9f38b53b5 100644 --- a/rules/liboping.make +++ b/rules/liboping.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBOPING) += liboping # # Paths and names # -LIBOPING_VERSION := 1.6.2 -LIBOPING_MD5 := 6f3e0d38ea03362476ac3be8b3fd961e +LIBOPING_VERSION := 1.9.0 +LIBOPING_MD5 := 28d085b95d1ca1acd541fc2606d5e02d LIBOPING := liboping-$(LIBOPING_VERSION) LIBOPING_SUFFIX:= tar.gz LIBOPING_URL := http://verplant.org/liboping/files/$(LIBOPING).$(LIBOPING_SUFFIX) @@ -35,7 +35,9 @@ LIBOPING_LICENSE := LGPL-2.1+ LIBOPING_CONF_TOOL := autoconf LIBOPING_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --enable-shared \ --disable-static \ + --disable-debug \ --without-perl-bindings # -- 2.12.2 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 6/7] net-snmp: add patch for CVE-2015-5621
Signed-off-by: Clemens Gruber
---
...02-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch | 128 +
patches/net-snmp-5.7.3/series | 3 +-
2 files changed, 130 insertions(+), 1 deletion(-)
create mode 100644
patches/net-snmp-5.7.3/0002-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
diff --git
a/patches/net-snmp-5.7.3/0002-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
b/patches/net-snmp-5.7.3/0002-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
new file mode 100644
index 0..7b804576b
--- /dev/null
+++ b/patches/net-snmp-5.7.3/0002-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
@@ -0,0 +1,128 @@
+From: Hideki Yamane
+Date: Thu, 18 Jun 2015 06:21:20 +0900
+Subject: [PATCH] Bug#788964: net-snmp snmp_pdu_parse() DoS
+
+taken patch from
https://sourceforge.net/p/net-snmp/code/ci/f23bcd3ac6ddee5d0a48f9703007ccc738914791/
+---
+ snmplib/snmp_api.c | 55 +++---
+ 1 file changed, 28 insertions(+), 27 deletions(-)
+
+diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c
+index 191debf09a3d..adae4e4a9550 100644
+--- a/snmplib/snmp_api.c
b/snmplib/snmp_api.c
+@@ -4350,10 +4350,9 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t
* length)
+ u_char type;
+ u_char msg_type;
+ u_char *var_val;
+-int badtype = 0;
+ size_t len;
+ size_t four;
+-netsnmp_variable_list *vp = NULL;
++netsnmp_variable_list *vp = NULL, *vplast = NULL;
+ oid objid[MAX_OID_LEN];
+ u_char *p;
+
+@@ -4493,38 +4492,24 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t
* length)
+ (ASN_SEQUENCE | ASN_CONSTRUCTOR),
+ "varbinds");
+ if (data == NULL)
+-return -1;
++goto fail;
+
+ /*
+ * get each varBind sequence
+ */
+ while ((int) *length > 0) {
+-netsnmp_variable_list *vptemp;
+-vptemp = (netsnmp_variable_list *) malloc(sizeof(*vptemp));
+-if (NULL == vptemp) {
+-return -1;
+-}
+-if (NULL == vp) {
+-pdu->variables = vptemp;
+-} else {
+-vp->next_variable = vptemp;
+-}
+-vp = vptemp;
++vp = SNMP_MALLOC_TYPEDEF(netsnmp_variable_list);
++if (NULL == vp)
++goto fail;
+
+-vp->next_variable = NULL;
+-vp->val.string = NULL;
+ vp->name_length = MAX_OID_LEN;
+-vp->name = NULL;
+-vp->index = 0;
+-vp->data = NULL;
+-vp->dataFreeHook = NULL;
+ DEBUGDUMPSECTION("recv", "VarBind");
+ data = snmp_parse_var_op(data, objid, &vp->name_length, &vp->type,
+ &vp->val_len, &var_val, length);
+ if (data == NULL)
+-return -1;
++goto fail;
+ if (snmp_set_var_objid(vp, objid, vp->name_length))
+-return -1;
++goto fail;
+
+ len = MAX_PACKET_LENGTH;
+ DEBUGDUMPHEADER("recv", "Value");
+@@ -4604,7 +4589,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t *
length)
+ vp->val.string = (u_char *) malloc(vp->val_len);
+ }
+ if (vp->val.string == NULL) {
+-return -1;
++goto fail;
+ }
+ p = asn_parse_string(var_val, &len, &vp->type, vp->val.string,
+ &vp->val_len);
+@@ -4619,7 +4604,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t *
length)
+ vp->val_len *= sizeof(oid);
+ vp->val.objid = (oid *) malloc(vp->val_len);
+ if (vp->val.objid == NULL) {
+-return -1;
++goto fail;
+ }
+ memmove(vp->val.objid, objid, vp->val_len);
+ break;
+@@ -4631,7 +4616,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t *
length)
+ case ASN_BIT_STR:
+ vp->val.bitstring = (u_char *) malloc(vp->val_len);
+ if (vp->val.bitstring == NULL) {
+-return -1;
++goto fail;
+ }
+ p = asn_parse_bitstring(var_val, &len, &vp->type,
+ vp->val.bitstring, &vp->val_len);
+@@ -4640,12 +4625,28 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t
* length)
+ break;
+ default:
+ snmp_log(LOG_ERR, "bad type returned (%x)\n", vp->type);
+-badtype = -1;
++goto fail;
+ break;
+ }
+ DEBUGINDENTADD(-4);
++
++if (NULL == vplast) {
++pdu->variables = vp;
++} else {
++vplast->next_variable = vp;
++}
++vplast = vp;
++vp = NULL;
+ }
+-return badtype;
++return 0;
++
++ fail:
++DEBUGMSGTL(("recv", "error while parsing VarBindList\n"));
++/** if we were parsing a var,
[ptxdist] [PATCH 2/7] collectd: improve systemd service file
collectd supports systemd notify. Also add requirements and increase RestartSec. This is the Debian service file without docs and default env file. Signed-off-by: Clemens Gruber --- projectroot/lib/systemd/system/collectd.service | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/projectroot/lib/systemd/system/collectd.service b/projectroot/lib/systemd/system/collectd.service index 752245c05..5748a6438 100644 --- a/projectroot/lib/systemd/system/collectd.service +++ b/projectroot/lib/systemd/system/collectd.service @@ -1,9 +1,16 @@ [Unit] -Description=statistics collection daemon +Description=Statistics collection and monitoring daemon +After=local-fs.target network.target +Requires=local-fs.target network.target +ConditionPathExists=/etc/collectd/collectd.conf [Service] -ExecStart=/usr/sbin/collectd -f +Type=notify +NotifyAccess=main +ExecStartPre=/usr/sbin/collectd -t +ExecStart=/usr/sbin/collectd Restart=always +RestartSec=10 [Install] WantedBy=multi-user.target -- 2.12.2 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 7/7] rrdtool: add systemd unit for rrdcached
Signed-off-by: Clemens Gruber --- projectroot/lib/systemd/system/rrdcached.service | 5 + projectroot/lib/systemd/system/rrdcached.socket | 8 rules/rrdtool.in | 12 rules/rrdtool.make | 8 4 files changed, 33 insertions(+) create mode 100644 projectroot/lib/systemd/system/rrdcached.service create mode 100644 projectroot/lib/systemd/system/rrdcached.socket diff --git a/projectroot/lib/systemd/system/rrdcached.service b/projectroot/lib/systemd/system/rrdcached.service new file mode 100644 index 0..bb30a502e --- /dev/null +++ b/projectroot/lib/systemd/system/rrdcached.service @@ -0,0 +1,5 @@ +[Unit] +Description=Data caching daemon for rrdtool + +[Service] +ExecStart=/usr/bin/rrdcached -g diff --git a/projectroot/lib/systemd/system/rrdcached.socket b/projectroot/lib/systemd/system/rrdcached.socket new file mode 100644 index 0..d3f6b277f --- /dev/null +++ b/projectroot/lib/systemd/system/rrdcached.socket @@ -0,0 +1,8 @@ +[Unit] +Description=rrdcached socket + +[Socket] +ListenStream=/tmp/rrdcached.sock + +[Install] +WantedBy=sockets.target diff --git a/rules/rrdtool.in b/rules/rrdtool.in index fa7e1de1c..fb91a8b84 100644 --- a/rules/rrdtool.in +++ b/rules/rrdtool.in @@ -34,6 +34,18 @@ config RRDTOOL_RRDCACHED accumulates them and, if enough have been received or a defined time has passed, writes the updates to the RRD file. +if RRDTOOL_RRDCACHED + +config RRDTOOL_RRDCACHED_SYSTEMD_UNIT + bool + default y + depends on SYSTEMD + prompt "install rrdcached systemd unit" + help + Install and enable a systemd socket-activated service + +endif + config RRDTOOL_RRDCGI bool depends on RRDTOOL_RRD_GRAPH diff --git a/rules/rrdtool.make b/rules/rrdtool.make index 2c7453811..d43dcac61 100644 --- a/rules/rrdtool.make +++ b/rules/rrdtool.make @@ -82,6 +82,14 @@ $(STATEDIR)/rrdtool.targetinstall: ifdef PTXCONF_RRDTOOL_RRDCACHED @$(call install_copy, rrdtool, 0, 0, 0755, -, /usr/bin/rrdcached) +ifdef PTXCONF_RRDTOOL_RRDCACHED_SYSTEMD_UNIT + @$(call install_alternative, rrdtool, 0, 0, 0644, \ + /lib/systemd/system/rrdcached.service) + @$(call install_alternative, rrdtool, 0, 0, 0644, \ + /lib/systemd/system/rrdcached.socket) + @$(call install_link, rrdtool, ../rrdcached.socket, \ + /lib/systemd/system/sockets.target.wants/rrdcached.socket) +endif endif ifdef PTXCONF_RRDTOOL_RRDCGI @$(call install_copy, rrdtool, 0, 0, 0755, -, /usr/bin/rrdcgi) -- 2.12.2 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/7] collectd: version bump 5.7.0 -> 5.7.1
Signed-off-by: Clemens Gruber
---
rules/collectd.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/collectd.make b/rules/collectd.make
index 0c1a11330..820b452a4 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_COLLECTD) += collectd
#
# Paths and names
#
-COLLECTD_VERSION := 5.7.0
+COLLECTD_VERSION := 5.7.1
COLLECTD := collectd-$(COLLECTD_VERSION)
COLLECTD_SUFFIX:= tar.bz2
COLLECTD_URL :=
http://collectd.org/files/${COLLECTD}.${COLLECTD_SUFFIX}
-COLLECTD_MD5 := c5cbe74a5638cac793caa13b3df60ce1
+COLLECTD_MD5 := dc36141ed3058c4919bbd54b87c07873
COLLECTD_DIR := $(BUILDDIR)/$(COLLECTD)
COLLECTD_SOURCE:= $(SRCDIR)/$(COLLECTD).$(COLLECTD_SUFFIX)
COLLECTD_LICENSE := GPL2
--
2.12.2
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 4/7] ethtool: version bump 4.8 -> 4.10
Signed-off-by: Clemens Gruber --- rules/ethtool.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/ethtool.make b/rules/ethtool.make index dd91956f4..f1ec9e777 100644 --- a/rules/ethtool.make +++ b/rules/ethtool.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_ETHTOOL) += ethtool # # Paths and names # -ETHTOOL_VERSION:= 4.8 -ETHTOOL_MD5:= e9e7286178f172c9f21bafbfb978d6de +ETHTOOL_VERSION:= 4.10 +ETHTOOL_MD5:= e462579c12bcf306730600d571b0458c ETHTOOL_SUFFIX := tar.xz ETHTOOL:= ethtool-$(ETHTOOL_VERSION) ETHTOOL_URL:= $(call ptx/mirror, KERNEL, ../software/network/ethtool/$(ETHTOOL).$(ETHTOOL_SUFFIX)) -- 2.12.2 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/7] collectd: add memory, ping and rrdcached plugin
Also select RRDTOOL_RRDCACHED if rrdcached plugin is used. Signed-off-by: Clemens Gruber --- projectroot/etc/collectd.d/memory.conf| 1 + projectroot/etc/collectd.d/ping.conf | 5 + projectroot/etc/collectd.d/rrdcached.conf | 7 +++ rules/collectd.in | 28 ++-- rules/collectd.make | 6 +++--- 5 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 projectroot/etc/collectd.d/memory.conf create mode 100644 projectroot/etc/collectd.d/ping.conf create mode 100644 projectroot/etc/collectd.d/rrdcached.conf diff --git a/projectroot/etc/collectd.d/memory.conf b/projectroot/etc/collectd.d/memory.conf new file mode 100644 index 0..249ff7f2e --- /dev/null +++ b/projectroot/etc/collectd.d/memory.conf @@ -0,0 +1 @@ +LoadPlugin memory diff --git a/projectroot/etc/collectd.d/ping.conf b/projectroot/etc/collectd.d/ping.conf new file mode 100644 index 0..f8d63a1bb --- /dev/null +++ b/projectroot/etc/collectd.d/ping.conf @@ -0,0 +1,5 @@ +LoadPlugin ping + + + Host 8.8.8.8 # changeme + diff --git a/projectroot/etc/collectd.d/rrdcached.conf b/projectroot/etc/collectd.d/rrdcached.conf new file mode 100644 index 0..9e8206677 --- /dev/null +++ b/projectroot/etc/collectd.d/rrdcached.conf @@ -0,0 +1,7 @@ +LoadPlugin rrdcached + + + DaemonAddress "unix:/tmp/rrdcached.sock" + DataDir "/var/lib/collectd/rrd" + CreateFiles true + diff --git a/rules/collectd.in b/rules/collectd.in index ba359f092..015e4b6fe 100644 --- a/rules/collectd.in +++ b/rules/collectd.in @@ -2,8 +2,10 @@ menuconfig COLLECTD tristate - select RRDTOOL if COLLECTD_RRDTOOL - select LM_SENSORS if COLLECTD_SENSORS + select LIBOPING if COLLECTD_PING + select RRDTOOL if COLLECTD_RRDTOOL || COLLECTD_RRDCACHED + select RRDTOOL_RRDCACHEDif COLLECTD_RRDCACHED + select LM_SENSORS if COLLECTD_SENSORS prompt "collectd " help collectd is a daemon which collects system performance statistics @@ -35,6 +37,13 @@ config COLLECTD_RRDTOOL With the RRDtool plugin, collectd writes values into a round-robin database, using librrd. +config COLLECTD_RRDCACHED + bool + prompt "rrdcached" + help + Connects to the RRD caching daemon and submits updates + for RRD files to that daemon. + comment "Read Plugins" config COLLECTD_CPU @@ -44,6 +53,21 @@ config COLLECTD_CPU The CPU plugin collects data about what your CPU is actually doing, and if it is being idle or in the various states. +config COLLECTD_MEMORY + bool + prompt "memory" + help + The Memory plugin collects physical memory utilization. + +config COLLECTD_PING + bool + prompt "ping" + help + The Ping plugin starts a new thread which sends ICMP "ping" packets + to the configured hosts periodically and measures the network + latency. + + config COLLECTD_SENSORS bool prompt "sensors" diff --git a/rules/collectd.make b/rules/collectd.make index 73d1a1154..0c1a11330 100644 --- a/rules/collectd.make +++ b/rules/collectd.make @@ -119,7 +119,7 @@ COLLECTD_ENABLE-+= mbmon COLLECTD_ENABLE- += md COLLECTD_ENABLE- += memcachec COLLECTD_ENABLE- += memcached -COLLECTD_ENABLE- += memory +COLLECTD_ENABLE-$(PTXCONF_COLLECTD_MEMORY) += memory COLLECTD_ENABLE- += mic COLLECTD_ENABLE- += modbus COLLECTD_ENABLE- += mqtt @@ -144,7 +144,7 @@ COLLECTD_ENABLE-+= oracle COLLECTD_ENABLE- += perl COLLECTD_ENABLE- += pf COLLECTD_ENABLE- += pinba -COLLECTD_ENABLE- += ping +COLLECTD_ENABLE-$(PTXCONF_COLLECTD_PING) += ping COLLECTD_ENABLE- += postgresql COLLECTD_ENABLE- += powerdns COLLECTD_ENABLE- += processes @@ -152,7 +152,7 @@ COLLECTD_ENABLE-+= protocols COLLECTD_ENABLE- += python COLLECTD_ENABLE- += redis COLLECTD_ENABLE- += routeros -COLLECTD_ENABLE- += rrdcached +COLLECTD_ENABLE-$(PTXCONF_COLLECTD_RRDCACHED) += rrdcached COLLECTD_ENABLE-$(PTXCONF_COLLECTD_RRDTOOL)+= rrdtool COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SENSORS)+= sensors COLLECTD_ENABLE- += serial -- 2.12.2 ___ pt
[ptxdist] [PATCH] e2fsprogs: add e4crypt and e4defrag
Signed-off-by: Clemens Gruber --- rules/e2fsprogs.in | 20 ++-- rules/e2fsprogs.make | 10 +- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in index 18879ed91..b42f600c3 100644 --- a/rules/e2fsprogs.in +++ b/rules/e2fsprogs.in @@ -9,8 +9,8 @@ menuconfig E2FSPROGS select LIBUUID help The e2fsprogs package provides the filesystem utilities for use -with the ext2 filesystem. It also supports the ext3 filesystem -with journaling support. +with the ext2 filesystem. It also supports the ext3 and ext4 +filesystems. if E2FSPROGS @@ -186,6 +186,22 @@ config E2FSPROGS_INSTALL_E2UNDO help Enable support for e2undo program. +config E2FSPROGS_INSTALL_E4CRYPT + bool + select E2FSPROGS_LIBCOM_ERR + prompt "e4crypt" + help + Enable support for e4crypt, an ext4 filesystem encryption + utility. + +config E2FSPROGS_INSTALL_E4DEFRAG + bool + select E2FSPROGS_LIBCOM_ERR + prompt "e4defrag" + help + Enable support for e4defrag, an online defragmenter for the + ext4 filesystem. + config E2FSPROGS_INSTALL_FILEFRAG bool prompt "filefrag" diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 6e16b4fcf..e9008fb63 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -56,7 +56,7 @@ E2FSPROGS_CONF_OPT:= \ --$(call ptx/endis,PTXCONF_E2FSPROGS_INSTALL_DEBUGFS)-debugfs \ --$(call ptx/endis,PTXCONF_E2FSPROGS_IMAGER)-imager \ --$(call ptx/endis,PTXCONF_E2FSPROGS_RESIZER)-resizer \ - --disable-defrag \ + --$(call ptx/endis,PTXCONF_E2FSPROGS_INSTALL_E4DEFRAG)-defrag \ --$(call ptx/endis,PTXCONF_E2FSPROGS_INSTALL_E2FSCK)-fsck \ --disable-e2initrd-helper \ --disable-tls \ @@ -161,6 +161,14 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_E2UNDO @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/e2undo) endif +ifdef PTXCONF_E2FSPROGS_INSTALL_E4CRYPT + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/e4crypt) +endif + +ifdef PTXCONF_E2FSPROGS_INSTALL_E4DEFRAG + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/e4defrag) +endif + ifdef PTXCONF_E2FSPROGS_INSTALL_FILEFRAG @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/filefrag) endif -- 2.12.2 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] ppp: version bump 2.4.5 -> 2.4.7
On Fri, Apr 21, 2017 at 03:02:37PM +0200, Michael Olbrich wrote: > On Wed, Apr 12, 2017 at 10:30:51PM +0200, Ladislav Michl wrote: > > Signed-off-by: Ladislav Michl > > --- > > Changes: > > - v2: Add forgotten 0030-no_crypt_hack.patch > > > > Note: patches were not refreshed and renumbered as it > > would make review more difficult. I'm ready to send > > v3, eventually. > > I assume, the removed patches are included in the new version? Yes, all dropped patches are present in mainline. > If you create the patch with '-M' then renamed files are detected and can > be reviewed sanely. Ok, will use that when generating new version. > mkl: You added these patches initially. Where are those from? Debian? Maybe > we should check there for new versions. I checked Debian when doing update and not all patches comes from there. This is list of debian patches against 2.4.7: 857 pro 4 2015 010_scripts_README.diff 4786 pro 30 2015 011_scripts_redialer.diff 2901 pro 4 2015 018_ip-up_option.diff 2070 pro 4 2015 adaptive_echos 958 pro 4 2015 chat_man 11144 led 27 2016 cifdefroute.dif 1144 pro 30 2015 close_dev_ppp 1177 pro 30 2015 fix_linkpidfile 682 lis 11 12:48 fix-rp-pppoe-ftbfs.patch 2090 pro 30 2015 ipv6-accept-remote 7376 pro 30 2015 makefiles_cleanup 1255 pro 4 2015 no_crypt_hack 5133 pro 4 2015 ppp-2.3.11-oedod.dif 6173 led 27 2016 ppp-2.4.2-ifname.diff 1018 pro 4 2015 ppp-2.4.2-stripMSdomain 1222 led 27 2016 ppp-2.4.4-strncatfix.patch 932 led 27 2016 pppd-soname-hack.patch 868 pro 4 2015 pppdump_use_zlib 2186 pro 4 2015 pppoatm_cleanup 2584 pro 4 2015 pppoatm_resolver_light 277 pro 4 2015 pppoe_noads 10740 čen 29 2016 pr-28-pppoe-custom-host-uniq-tag.patch 1116 led 27 2016 radius-config.c-unkown-typo 868 pro 4 2015 radius_mtu 776 pro 4 2015 rc_mksid-no-buffer-overflow 434 pro 4 2015 readable_connerrs 276 pro 4 2015 resolv.conf_no_log 637 led 27 2016 secure-card-interpreter-fix 735 lis 11 12:18 series 698 pro 4 2015 setenv_call_file 1623 pro 4 2015 zzz_config Best regards, ladis ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Helper script to keep configure arguments up to date
Hi, I've just added scripts/configure_helper.py to ptxdist. This is a tool to help update or create autoconf packages. Please use it before sending patches. It basically does what I always tell you to do manually: It checks the output of './configure --help' and compares it with the options specified in the rule. So how does it work? Here is a short example: Let's say I want to update the 'glib' package to a newer version. 1. Update the version in the rule 2. Extract the source: $ ptxdist extract glib 3. Check if I need to to change the options: 3.1 compare old and new configure scripts: $ .../scripts/configure_helper.py --pkg glib --old-src platform-foo/build-target/glib-2.50.2/ No output: Great! 3.2 But maybe to existing options weren't so great: $ .../scripts/configure_helper.py --pkg glib > --- > +++ > @@ -2,8 +2,8 @@ > --sysconfdir=/etc > --localstatedir=/var > --libdir=/usr/lib > + --build=x86_64-host-linux-gnu > --host=arm-v7a-linux-gnueabihf > - --build=x86_64-host-linux-gnu This is ok, just reordered for the generic options > --enable-debug=minimum > --disable-gc-friendly > --enable-mem-pools > @@ -20,10 +20,17 @@ > --disable-libelf > --disable-libmount > --disable-gtk-doc > + --enable-gtk-doc-html > + --enable-gtk-doc-pdf I could add those, but I know, that the docs are not build anyways, so right now I don't care. > --disable-man > --disable-dtrace > --disable-systemtap > --disable-coverage > + --disable-compile-warnings I don't care about that. > + --with-runtime-libdir=RELPATH The default is just fine, just like most other dirs like libdir etc. > + --with-python=PATH This is python for building and the on in the path is the correct on so this is not needed. > --with-libiconv=no > + --with-gio-module-dir=DIR Same as above. > --with-threads=posix > --with-pcre=system > + --with-tapset-install-dir=DIR These files are not used in ptxdist, so I don't care where they are installed. Great, no new options. Now I just need to test the package before submitting a patch... This is what I expect you to do before submitting a patch that adds or updates a package. This script has a long blacklist with options that don't need to be set. For the rest use common sense or ask here if you are unsure. I wrote this for me because doing this manually for many packages is really annoying. I hope this will help you too. Of course, now it's easier for me to check you patches and I can be even more pedantic about configure options... :-) Regards, 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 v2] ppp: version bump 2.4.5 -> 2.4.7
On Wed, Apr 12, 2017 at 10:30:51PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl
> ---
> Changes:
> - v2: Add forgotten 0030-no_crypt_hack.patch
>
> Note: patches were not refreshed and renumbered as it
> would make review more difficult. I'm ready to send
> v3, eventually.
I assume, the removed patches are included in the new version?
If you create the patch with '-M' then renamed files are detected and can
be reviewed sanely.
mkl: You added these patches initially. Where are those from? Debian? Maybe
we should check there for new versions.
Michael
> patches/ppp-2.4.5/0001-git-20100307.patch | 134 -
> patches/ppp-2.4.5/0002-pppoatm_no_modprobe.patch | 21 ---
> patches/ppp-2.4.5/0004-use_system_logwtmp.patch| 28
> patches/ppp-2.4.5/0005-update_if_pppol2tp.patch| 61
> .../ppp-2.4.5/0006-dont-exit-pado-timeout.patch| 50 ---
> patches/ppp-2.4.5/0007-fix_warnings.patch | 38 -
> patches/ppp-2.4.5/0008-man_syntax_errors.patch | 63
> patches/ppp-2.4.5/0013-documentation_typos.patch | 95
> patches/ppp-2.4.5/0015-fix_null_pppdb.patch| 35 -
> patches/ppp-2.4.5/0024-radius_enanchements.patch | 166
> -
> ...Remove-old-version-of-Linux-if_pppol2tp.h.patch | 104 -
> .../0003-adaptive_echos.patch | 0
> .../0009-makefiles_cleanup.patch | 0
> .../0010-always_setsid.patch | 0
> .../0011-close_dev_ppp.patch | 0
> .../{ppp-2.4.5 => ppp-2.4.7}/0012-chat_man.patch | 0
> .../0014-fix_linkpidfile.patch | 0
> .../0016-pppdump_use_zlib.patch| 0
> .../0017-pppoatm_resolver_light.patch | 0
> .../0018-pppoatm_cleanup.patch | 0
> .../0019-pppoe_noads.patch | 0
> .../0020-readable_connerrs.patch | 0
> .../0021-011_scripts_redialer.diff.patch | 0
> .../0022-cifdefroute.dif.patch | 0
> .../0023-ppp-2.3.11-oedod.dif.patch| 0
> .../{ppp-2.4.5 => ppp-2.4.7}/0025-radius_mtu.patch | 0
> .../0026-018_ip-up_option.diff.patch | 0
> .../0027-ppp-2.4.2-stripMSdomain.patch | 0
> .../0028-setenv_call_file.patch| 0
> .../0029-010_scripts_README.diff.patch | 0
> .../0030-no_crypt_hack.patch | 24 ++-
> .../0031-resolv.conf_no_log.patch | 0
> .../{ppp-2.4.5 => ppp-2.4.7}/0032-zzz_config.patch | 5 +-
> .../0033-pppd-make-makefile-sysroot-aware.patch| 0
> ...-make-the-self-made-configure-cross-aware.patch | 0
> .../0035-use-CPPFLAGS-when-compiling.patch | 0
> patches/{ppp-2.4.5 => ppp-2.4.7}/series| 11 --
> rules/ppp.make | 4 +-
> 38 files changed, 21 insertions(+), 818 deletions(-)
>
> diff --git a/patches/ppp-2.4.5/0001-git-20100307.patch
> b/patches/ppp-2.4.5/0001-git-20100307.patch
> deleted file mode 100644
> index d0d0e5b4a..0
> --- a/patches/ppp-2.4.5/0001-git-20100307.patch
> +++ /dev/null
> @@ -1,134 +0,0 @@
> -From: Marco d'Itri
> -Date: Wed, 25 Jan 2012 19:14:26 +0100
> -Subject: [PATCH] git-20100307
> -
>
> - pppd/lcp.c | 28 +++-
> - pppd/plugins/pppol2tp/Makefile.linux |2 +-
> - pppd/plugins/rp-pppoe/plugin.c |4 ++--
> - pppd/pppd.8 |8
> - 4 files changed, 30 insertions(+), 12 deletions(-)
> -
> -diff --git a/pppd/lcp.c b/pppd/lcp.c
> -index 5c77490..8ed2778 100644
> a/pppd/lcp.c
> -+++ b/pppd/lcp.c
> -@@ -397,21 +397,29 @@ lcp_close(unit, reason)
> - char *reason;
> - {
> - fsm *f = &lcp_fsm[unit];
> -+int oldstate;
> -
> - if (phase != PHASE_DEAD && phase != PHASE_MASTER)
> - new_phase(PHASE_TERMINATE);
> --if (f->state == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) {
> -+
> -+if (f->flags & DELAYED_UP) {
> -+untimeout(lcp_delayed_up, f);
> -+f->state = STOPPED;
> -+}
> -+oldstate = f->state;
> -+
> -+fsm_close(f, reason);
> -+if (oldstate == STOPPED && f->flags &
> (OPT_PASSIVE|OPT_SILENT|DELAYED_UP)) {
> - /*
> - * This action is not strictly according to the FSM in RFC1548,
> - * but it does mean that the program terminates if you do a
> -- * lcp_close() in passive/silent mode when a connection hasn't
> -- * been established.
> -+ * lcp_close() when a connection hasn't been established
> -+ * because we are in passive/silent mode or because we have
> -+ * delayed the fsm_lowerup() call and it hasn't happened yet.
> - */
> --f->state = CLOSED;
> -+f->flags &= ~DELAYED_UP;
> - lcp_finished(f);
> --
> --} else
> --fsm_close(f, reason);
> -+
