From: jon@ringle.org
To: ptxdist@pengutronix.com
Cc: Jon Ringle <jringle@gridpoint.com>
Subject: [ptxdist] [PATCH v2] socat: version bump 1.7.3.0 => 1.7.3.2
Date: Fri, 3 Aug 2018 15:08:09 -0400 [thread overview]
Message-ID: <1533323289-7717-1-git-send-email-jon@ringle.org> (raw)
From: Jon Ringle <jringle@gridpoint.com>
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
.../0001-Makefile.in-fix-for-parallel-build.patch | 26 ----------------------
patches/socat-1.7.3.0/series | 4 ----
.../0001-Makefile.in-fix-for-parallel-build.patch | 26 ++++++++++++++++++++++
patches/socat-1.7.3.2/series | 4 ++++
rules/socat.make | 4 ++--
5 files changed, 32 insertions(+), 32 deletions(-)
delete mode 100644 patches/socat-1.7.3.0/0001-Makefile.in-fix-for-parallel-build.patch
delete mode 100644 patches/socat-1.7.3.0/series
create mode 100644 patches/socat-1.7.3.2/0001-Makefile.in-fix-for-parallel-build.patch
create mode 100644 patches/socat-1.7.3.2/series
diff --git a/patches/socat-1.7.3.0/0001-Makefile.in-fix-for-parallel-build.patch b/patches/socat-1.7.3.0/0001-Makefile.in-fix-for-parallel-build.patch
deleted file mode 100644
index 77cf6f2..0000000
--- a/patches/socat-1.7.3.0/0001-Makefile.in-fix-for-parallel-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Markus Niebel <Markus.Niebel@tq-group.de>
-Date: Tue, 25 Aug 2015 17:48:55 +0200
-Subject: [PATCH] Makefile.in: fix for parallel build
-
-Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue.
-
-original patch for OE-Core by: Robert Yang <liezhi.yang at windriver.com>
-
-Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.de>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f2a6edb87890..88b784b1592c 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -118,7 +118,7 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut
- procan: $(PROCAN_OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS)
-
--filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
-+filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS)
-
- libxio.a: $(XIOOBJS) $(UTLOBJS)
diff --git a/patches/socat-1.7.3.0/series b/patches/socat-1.7.3.0/series
deleted file mode 100644
index c1c7355..0000000
--- a/patches/socat-1.7.3.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Makefile.in-fix-for-parallel-build.patch
-# 61dca8976a5f7b756e48ea74ebd2750d - git-ptx-patches magic
diff --git a/patches/socat-1.7.3.2/0001-Makefile.in-fix-for-parallel-build.patch b/patches/socat-1.7.3.2/0001-Makefile.in-fix-for-parallel-build.patch
new file mode 100644
index 0000000..77cf6f2
--- /dev/null
+++ b/patches/socat-1.7.3.2/0001-Makefile.in-fix-for-parallel-build.patch
@@ -0,0 +1,26 @@
+From: Markus Niebel <Markus.Niebel@tq-group.de>
+Date: Tue, 25 Aug 2015 17:48:55 +0200
+Subject: [PATCH] Makefile.in: fix for parallel build
+
+Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue.
+
+original patch for OE-Core by: Robert Yang <liezhi.yang at windriver.com>
+
+Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.de>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f2a6edb87890..88b784b1592c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -118,7 +118,7 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut
+ procan: $(PROCAN_OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS)
+
+-filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
++filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS)
+
+ libxio.a: $(XIOOBJS) $(UTLOBJS)
diff --git a/patches/socat-1.7.3.2/series b/patches/socat-1.7.3.2/series
new file mode 100644
index 0000000..c1c7355
--- /dev/null
+++ b/patches/socat-1.7.3.2/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Makefile.in-fix-for-parallel-build.patch
+# 61dca8976a5f7b756e48ea74ebd2750d - git-ptx-patches magic
diff --git a/rules/socat.make b/rules/socat.make
index f21d78b..9a8b322 100644
--- a/rules/socat.make
+++ b/rules/socat.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SOCAT) += socat
# Paths and names
#
-SOCAT_VERSION := 1.7.3.0
-SOCAT_MD5 := de46e3f726f783271226eb94d5109bf8
+SOCAT_VERSION := 1.7.3.2
+SOCAT_MD5 := aec3154f7854580cfab0c2d81e910519
SOCAT := socat-$(SOCAT_VERSION)
SOCAT_SUFFIX := tar.gz
SOCAT_URL := http://www.dest-unreach.org/socat/download/$(SOCAT).$(SOCAT_SUFFIX)
--
1.9.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2018-08-03 19:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1533323289-7717-1-git-send-email-jon@ringle.org \
--to=jon@ringle.org \
--cc=jringle@gridpoint.com \
--cc=ptxdist@pengutronix.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox