Patch naming conventions !

SVN-Revision: 6005

diff --git a/libs/howl/patches/01-config.patch b/libs/howl/patches/01-config.patch
new file mode 100644 (file)
index 0000000..a0c26d1
--- /dev/null
+++ b/libs/howl/patches/01-config.patch
@@ -0,0 +1,14 @@
+--- howl-0.9.10-orig/src/mDNSResponder/Posix/posix_main.c      2005-01-27 04:11:20.000000000 +0100
++++ howl-0.9.10-2/src/mDNSResponder/Posix/posix_main.c 2005-03-19 13:04:42.000000000 +0100
+@@ -249,9 +249,9 @@
+       {
+               sw_mdns_servant_load_file(servant, conf_file);
+       }
+-      else if (sw_mdns_servant_load_file(servant, "/etc/howl/mDNSResponder.conf") != SW_OKAY)
++      else
+       {
+-              sw_mdns_servant_load_file(servant, "/usr/local/etc/howl/mDNSResponder.conf");
++              sw_mdns_servant_load_file(servant, "/etc/mDNSResponder.conf");
+       }
+ 
+       write_pidfile("mDNSResponder", &pidfd);

diff --git a/libs/howl/patches/02-debug_log.patch b/libs/howl/patches/02-debug_log.patch
new file mode 100644 (file)
index 0000000..91410b8
--- /dev/null
+++ b/libs/howl/patches/02-debug_log.patch
@@ -0,0 +1,10 @@
+--- howl-0.9.10-orig/src/mDNSResponder/Posix/posix_main.c      2005-01-27 04:11:20.000000000 +0100
++++ howl-0.9.10-2/src/mDNSResponder/Posix/posix_main.c 2005-03-19 13:04:42.000000000 +0100
+@@ -186,6 +186,7 @@
+                       case 'd':
+                       {
+                               make_daemon = SW_FALSE;
++                              sw_debug_set_level(SW_LOG_VERBOSE);
+                       }
+                       break;
+ 

diff --git a/libs/howl/patches/03-proto_fix.patch b/libs/howl/patches/03-proto_fix.patch
new file mode 100644 (file)
index 0000000..0b9d105
--- /dev/null
+++ b/libs/howl/patches/03-proto_fix.patch
@@ -0,0 +1,11 @@
+--- howl-0.9.10-orig/include/salt/platform.h   2005-01-28 21:46:14.000000000 +0100
++++ howl-0.9.10-2/include/salt/platform.h      2005-03-19 13:04:42.000000000 +0100
+@@ -409,7 +409,7 @@
+  */
+ 
+ sw_const_string
+-sw_strerror();
++sw_strerror(void);
+ 
+ 
+ /*

diff --git a/libs/howl/patches/04-typedefs.patch b/libs/howl/patches/04-typedefs.patch
new file mode 100644 (file)
index 0000000..76c68d1
--- /dev/null
+++ b/libs/howl/patches/04-typedefs.patch
@@ -0,0 +1,32 @@
+diff -u10 -r howl-1.0.0/src/lib/howl/Posix/posix_interface.c howl-1.0.0-patched/src/lib/howl/Posix/posix_interface.c
+--- howl-1.0.0/src/lib/howl/Posix/posix_interface.c    2007-01-03 01:16:03.000000000 -0800
++++ howl-1.0.0-patched/src/lib/howl/Posix/posix_interface.c    2007-01-03 00:55:44.000000000 -0800
+@@ -30,24 +30,24 @@
+ #include <salt/debug.h>
+ #include <salt/interface.h>
+ #include <net/if.h> 
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <stdio.h>
+ 
+ #if defined(__linux__)
+-typedef unsigned long long u64;
+-typedef __uint32_t    u32;
+-typedef __uint16_t    u16;
+-typedef __uint8_t             u8;
++typedef unsigned long long __u64;
++typedef __uint32_t    __u32;
++typedef __uint16_t    __u16;
++typedef __uint8_t             __u8;
+ #     include <linux/sockios.h>
+ #     include <linux/ethtool.h> 
+ #endif
+ 
+ #ifndef SIOCGIFCONF
+ #     include <sys/sockio.h>
+ #endif
+ 
+ #define SW_E_BAD_ARG 23
+ 

diff --git a/libs/howl/patches/config-path.patch b/libs/howl/patches/config-path.patch
deleted file mode 100644 (file)
index a0c26d1..0000000
--- a/libs/howl/patches/config-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- howl-0.9.10-orig/src/mDNSResponder/Posix/posix_main.c      2005-01-27 04:11:20.000000000 +0100
-+++ howl-0.9.10-2/src/mDNSResponder/Posix/posix_main.c 2005-03-19 13:04:42.000000000 +0100
-@@ -249,9 +249,9 @@
-       {
-               sw_mdns_servant_load_file(servant, conf_file);
-       }
--      else if (sw_mdns_servant_load_file(servant, "/etc/howl/mDNSResponder.conf") != SW_OKAY)
-+      else
-       {
--              sw_mdns_servant_load_file(servant, "/usr/local/etc/howl/mDNSResponder.conf");
-+              sw_mdns_servant_load_file(servant, "/etc/mDNSResponder.conf");
-       }
- 
-       write_pidfile("mDNSResponder", &pidfd);

diff --git a/libs/howl/patches/debug-log.patch b/libs/howl/patches/debug-log.patch
deleted file mode 100644 (file)
index 91410b8..0000000
--- a/libs/howl/patches/debug-log.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- howl-0.9.10-orig/src/mDNSResponder/Posix/posix_main.c      2005-01-27 04:11:20.000000000 +0100
-+++ howl-0.9.10-2/src/mDNSResponder/Posix/posix_main.c 2005-03-19 13:04:42.000000000 +0100
-@@ -186,6 +186,7 @@
-                       case 'd':
-                       {
-                               make_daemon = SW_FALSE;
-+                              sw_debug_set_level(SW_LOG_VERBOSE);
-                       }
-                       break;
- 

diff --git a/libs/howl/patches/proto-fix.patch b/libs/howl/patches/proto-fix.patch
deleted file mode 100644 (file)
index 0b9d105..0000000
--- a/libs/howl/patches/proto-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- howl-0.9.10-orig/include/salt/platform.h   2005-01-28 21:46:14.000000000 +0100
-+++ howl-0.9.10-2/include/salt/platform.h      2005-03-19 13:04:42.000000000 +0100
-@@ -409,7 +409,7 @@
-  */
- 
- sw_const_string
--sw_strerror();
-+sw_strerror(void);
- 
- 
- /*

diff --git a/libs/howl/patches/typedefs.patch b/libs/howl/patches/typedefs.patch
deleted file mode 100644 (file)
index 76c68d1..0000000
--- a/libs/howl/patches/typedefs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -u10 -r howl-1.0.0/src/lib/howl/Posix/posix_interface.c howl-1.0.0-patched/src/lib/howl/Posix/posix_interface.c
---- howl-1.0.0/src/lib/howl/Posix/posix_interface.c    2007-01-03 01:16:03.000000000 -0800
-+++ howl-1.0.0-patched/src/lib/howl/Posix/posix_interface.c    2007-01-03 00:55:44.000000000 -0800
-@@ -30,24 +30,24 @@
- #include <salt/debug.h>
- #include <salt/interface.h>
- #include <net/if.h> 
- #include <arpa/inet.h>
- #include <errno.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <stdio.h>
- 
- #if defined(__linux__)
--typedef unsigned long long u64;
--typedef __uint32_t    u32;
--typedef __uint16_t    u16;
--typedef __uint8_t             u8;
-+typedef unsigned long long __u64;
-+typedef __uint32_t    __u32;
-+typedef __uint16_t    __u16;
-+typedef __uint8_t             __u8;
- #     include <linux/sockios.h>
- #     include <linux/ethtool.h> 
- #endif
- 
- #ifndef SIOCGIFCONF
- #     include <sys/sockio.h>
- #endif
- 
- #define SW_E_BAD_ARG 23
-