From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 15/28] dibbler: clean up patches
Date: Sun, 30 Oct 2011 23:00:46 +0100 [thread overview]
Message-ID: <1320012059-24971-15-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
patches/dibbler-0.7.3/0001-merge-dns-search.patch | 44 ++++++++++++++++++++
patches/dibbler-0.7.3/0002-fix-compile.patch | 39 +++++++++++++++++
.../dibbler-0.7.3/0003-fix-incremental-build.patch | 32 ++++++++++++++
patches/dibbler-0.7.3/fix-compile.patch | 31 --------------
patches/dibbler-0.7.3/fix-incremental-build.patch | 24 -----------
patches/dibbler-0.7.3/merge-dns-search.patch | 36 ----------------
patches/dibbler-0.7.3/series | 3 -
7 files changed, 115 insertions(+), 94 deletions(-)
create mode 100644 patches/dibbler-0.7.3/0001-merge-dns-search.patch
create mode 100644 patches/dibbler-0.7.3/0002-fix-compile.patch
create mode 100644 patches/dibbler-0.7.3/0003-fix-incremental-build.patch
delete mode 100644 patches/dibbler-0.7.3/fix-compile.patch
delete mode 100644 patches/dibbler-0.7.3/fix-incremental-build.patch
delete mode 100644 patches/dibbler-0.7.3/merge-dns-search.patch
delete mode 100644 patches/dibbler-0.7.3/series
diff --git a/patches/dibbler-0.7.3/0001-merge-dns-search.patch b/patches/dibbler-0.7.3/0001-merge-dns-search.patch
new file mode 100644
index 0000000..34c8cf5
--- /dev/null
+++ b/patches/dibbler-0.7.3/0001-merge-dns-search.patch
@@ -0,0 +1,44 @@
+From 43cbc6a6eecfc9bd2d8412e1ebb36c1bc471d076 Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 19:10:22 +0200
+Subject: [PATCH 1/3] merge-dns-search
+
+Merge DNS search tables between IPv4 and IPv6
+
+Without this patch the IPv4 search tables will be overwritten
+once an IPv6 domain is added. With this patch both tables
+will be merged.
+
+Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+---
+ Port-linux/lowlevel-options-linux.c | 13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/Port-linux/lowlevel-options-linux.c b/Port-linux/lowlevel-options-linux.c
+index d5be379..929b24b 100644
+--- a/Port-linux/lowlevel-options-linux.c
++++ b/Port-linux/lowlevel-options-linux.c
+@@ -199,11 +199,14 @@ int domain_add(const char* ifname, int ifaceid, const char* domain) {
+ return LOWLEVEL_ERROR_FILE;
+ while (fgets(buf,511,f)) {
+ if ( (!found) && (strstr(buf, "search")) ) {
+- if (strlen(buf))
+- buf[strlen(buf)-1]=0;
+- fprintf(f2, "%s %s\n", buf, domain);
+- found = 1;
+- continue;
++ if (!strstr(buf,domain)) {
++ if (strlen(buf))
++ buf[strlen(buf)-1]=0;
++ fprintf(f2, "%s %s\n", buf, domain);
++ found = 1;
++ continue;
++ }
++
+ }
+ fprintf(f2,"%s",buf);
+ }
+--
+1.7.7
+
diff --git a/patches/dibbler-0.7.3/0002-fix-compile.patch b/patches/dibbler-0.7.3/0002-fix-compile.patch
new file mode 100644
index 0000000..3af7ddf
--- /dev/null
+++ b/patches/dibbler-0.7.3/0002-fix-compile.patch
@@ -0,0 +1,39 @@
+From 7c97b5e9ea7aa16a5a6921a40e2b7a34ce2be93f Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 19:10:22 +0200
+Subject: [PATCH 2/3] fix-compile
+
+Fix compilation of dibbler package
+
+A header file is included that is not needed, and even breaks
+compilation on recent kernels. Remove it.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+---
+ Port-linux/utils.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Port-linux/utils.c b/Port-linux/utils.c
+index 4bdda71..14a27f5 100644
+--- a/Port-linux/utils.c
++++ b/Port-linux/utils.c
+@@ -14,6 +14,7 @@
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ */
+
++#define GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -26,7 +27,7 @@
+ #include <arpa/inet.h>
+ #include <resolv.h>
+ #include <asm/types.h>
+-#include <linux/pkt_sched.h>
++/*#include <linux/pkt_sched.h>*/
+ #include <time.h>
+ #include <sys/time.h>
+
+--
+1.7.7
+
diff --git a/patches/dibbler-0.7.3/0003-fix-incremental-build.patch b/patches/dibbler-0.7.3/0003-fix-incremental-build.patch
new file mode 100644
index 0000000..f40595f
--- /dev/null
+++ b/patches/dibbler-0.7.3/0003-fix-incremental-build.patch
@@ -0,0 +1,32 @@
+From 759e0b6853ee53744b308f3651ea02990e98bce0 Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 19:10:22 +0200
+Subject: [PATCH 3/3] fix-incremental-build
+
+Fix incremental build of dibbler package
+
+The make install fails if the changelog.gz already exists.
+So, the repair incremental builds make sure the changelog.gz
+file does not exist before generating a new one.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+---
+ Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b8895c1..48707a5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -428,7 +428,7 @@ install:
+ $(INSTALL) -m 644 doc/dibbler-devel.pdf $(INST_DOCDIR)/dibbler/dibbler-devel.pdf
+ @echo "[INSTALL] CHANGELOG"
+ $(INSTALL) -m 644 CHANGELOG $(INST_DOCDIR)/dibbler/changelog
+- gzip -9 $(INST_DOCDIR)/dibbler/changelog
++ gzip -f -9 $(INST_DOCDIR)/dibbler/changelog
+
+ DIR=`basename $(PWD)`
+
+--
+1.7.7
+
diff --git a/patches/dibbler-0.7.3/fix-compile.patch b/patches/dibbler-0.7.3/fix-compile.patch
deleted file mode 100644
index 66a4cf5..0000000
--- a/patches/dibbler-0.7.3/fix-compile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix compilation of dibbler package
-
-A header file is included that is not needed, and even breaks
-compilation on recent kernels. Remove it.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
----
- Port-linux/utils.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: dibbler-0.7.3/Port-linux/utils.c
-===================================================================
---- dibbler-0.7.3.orig/Port-linux/utils.c
-+++ dibbler-0.7.3/Port-linux/utils.c
-@@ -14,6 +14,7 @@
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
- */
-
-+#define GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -26,7 +27,7 @@
- #include <arpa/inet.h>
- #include <resolv.h>
- #include <asm/types.h>
--#include <linux/pkt_sched.h>
-+/*#include <linux/pkt_sched.h>*/
- #include <time.h>
- #include <sys/time.h>
-
diff --git a/patches/dibbler-0.7.3/fix-incremental-build.patch b/patches/dibbler-0.7.3/fix-incremental-build.patch
deleted file mode 100644
index cf56d96..0000000
--- a/patches/dibbler-0.7.3/fix-incremental-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix incremental build of dibbler package
-
-The make install fails if the changelog.gz already exists.
-So, the repair incremental builds make sure the changelog.gz
-file does not exist before generating a new one.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: dibbler-0.7.3/Makefile
-===================================================================
---- dibbler-0.7.3.orig/Makefile
-+++ dibbler-0.7.3/Makefile
-@@ -428,7 +428,7 @@ install:
- $(INSTALL) -m 644 doc/dibbler-devel.pdf $(INST_DOCDIR)/dibbler/dibbler-devel.pdf
- @echo "[INSTALL] CHANGELOG"
- $(INSTALL) -m 644 CHANGELOG $(INST_DOCDIR)/dibbler/changelog
-- gzip -9 $(INST_DOCDIR)/dibbler/changelog
-+ gzip -f -9 $(INST_DOCDIR)/dibbler/changelog
-
- DIR=`basename $(PWD)`
-
diff --git a/patches/dibbler-0.7.3/merge-dns-search.patch b/patches/dibbler-0.7.3/merge-dns-search.patch
deleted file mode 100644
index 0792843..0000000
--- a/patches/dibbler-0.7.3/merge-dns-search.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Merge DNS search tables between IPv4 and IPv6
-
-Without this patch the IPv4 search tables will be overwritten
-once an IPv6 domain is added. With this patch both tables
-will be merged.
-
-Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
----
- Port-linux/lowlevel-options-linux.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-Index: dibbler-0.7.3/Port-linux/lowlevel-options-linux.c
-===================================================================
---- dibbler-0.7.3.orig/Port-linux/lowlevel-options-linux.c
-+++ dibbler-0.7.3/Port-linux/lowlevel-options-linux.c
-@@ -199,11 +199,14 @@ int domain_add(const char* ifname, int i
- return LOWLEVEL_ERROR_FILE;
- while (fgets(buf,511,f)) {
- if ( (!found) && (strstr(buf, "search")) ) {
-- if (strlen(buf))
-- buf[strlen(buf)-1]=0;
-- fprintf(f2, "%s %s\n", buf, domain);
-- found = 1;
-- continue;
-+ if (!strstr(buf,domain)) {
-+ if (strlen(buf))
-+ buf[strlen(buf)-1]=0;
-+ fprintf(f2, "%s %s\n", buf, domain);
-+ found = 1;
-+ continue;
-+ }
-+
- }
- fprintf(f2,"%s",buf);
- }
diff --git a/patches/dibbler-0.7.3/series b/patches/dibbler-0.7.3/series
deleted file mode 100644
index b492525..0000000
--- a/patches/dibbler-0.7.3/series
+++ /dev/null
@@ -1,3 +0,0 @@
-merge-dns-search.patch
-fix-compile.patch
-fix-incremental-build.patch
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-30 22:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` Robert Schwebel [this message]
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
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=1320012059-24971-15-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--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