diff -ur syslog-ng-2.0.6.orig/src/syslog-ng.h syslog-ng-2.0.6/src/syslog-ng.h
--- syslog-ng-2.0.6.orig/src/syslog-ng.h 2007-09-22 16:16:15.000000000 +0200
+++ syslog-ng-2.0.6/src/syslog-ng.h 2007-12-08 08:25:22.000000000 +0100
-@@ -38,7 +38,7 @@
+@@ -50,9 +50,9 @@
+ #define PATH_SYSLOGNG PATH_PREFIX "/libexec/syslog-ng"
+ #endif
- #define PATH_SYSLOG_NG_CONF PATH_SYSCONFDIR "/syslog-ng.conf"
- #define PATH_PIDFILE "/var/run/syslog-ng.pid"
-#define PATH_PERSIST_CONFIG PATH_LOCALSTATEDIR "/syslog-ng.persist"
+-#define PATH_QDISK PATH_LOCALSTATEDIR
+-#define PATH_PATTERNDB_FILE PATH_LOCALSTATEDIR "/patterndb.xml"
+#define PATH_PERSIST_CONFIG "/var/lib/syslog-ng/syslog-ng.persist"
++#define PATH_QDISK "/var/lib/syslog-ng"
++#define PATH_PATTERNDB_FILE "/var/lib/syslog-ng/patterndb.xml"
#define LOG_PRIORITY_LISTEN 0
#define LOG_PRIORITY_READER 0
--- syslog-ng-2.0.3/configure.in.orig 2007-03-04 10:58:00.000000000 +0100
+++ syslog-ng-2.0.3/configure.in 2007-04-03 23:53:53.219462987 +0200
-@@ -149,11 +149,10 @@
-
- dnl Checks for library functions.
- AC_CHECK_LIB(door, door_create)
--AC_CHECK_LIB(socket, socket)
--AC_CHECK_LIB(rt, nanosleep)
--AC_CHECK_LIB(nsl, gethostbyname)
--AC_CHECK_LIB(regex, regexec)
--AC_CHECK_LIB(resolv, res_init)
-+AC_SEARCH_LIBS(socket, socket)
-+AC_SEARCH_LIBS(nanosleep, rt)
-+AC_SEARCH_LIBS(gethostbyname, nsl resolv)
-+AC_SEARCH_LIBS(regexec, regex)
-
- AC_CHECK_FUNCS(strdup strtol inet_aton inet_ntoa getopt_long getaddrinfo getutent)
+@@ -265,9 +265,8 @@
+ AC_CHECK_LIB(door, door_create, BASE_LIBS="$BASE_LIBS -ldoor")
+ AC_CHECK_LIB(socket, socket, BASE_LIBS="$BASE_LIBS -lsocket")
+ AC_CHECK_LIB(rt, nanosleep, BASE_LIBS="$BASE_LIBS -lrt")
+-AC_CHECK_LIB(nsl, gethostbyname, BASE_LIBS="$BASE_LIBS -lnsl")
++AC_CHECK_LIB(resolv, gethostbyname, BASE_LIBS="$BASE_LIBS -lresolv")
+ AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex")
+-AC_CHECK_LIB(resolv, res_init, RESOLV_LIBS="-lresolv")
+ if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then
+ AC_CHECK_LIB(cap, cap_set_proc, LIBCAP_LIBS="-lcap")