Update of /cvsroot/leaf/src/bering-uclibc/apps/ulogd
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31457

Modified Files:
        buildtool.cfg buildtool.mk 
Added Files:
        ulogd-configure.patch 
Log Message:
add mysql plugin setup and add the cron files to the local list

Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/ulogd/buildtool.cfg,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** buildtool.cfg       26 Jun 2006 18:05:34 -0000      1.8
--- buildtool.cfg       29 Nov 2006 21:40:10 -0000      1.9
***************
*** 43,50 ****
  </File>
  
  <Package>
        <ulogd>
                Version = 1.24
!               Revision = 2
  
                Help <<EOF
--- 43,57 ----
  </File>
  
+ <File ulogd-configure.patch>
+   Server = cvs-sourceforge
+   Revision = HEAD
+   envname = ULOGD_PATCH2
+   Directory = ulogd
+ </File>
+ 
  <Package>
        <ulogd>
                Version = 1.24
!               Revision = 3
  
                Help <<EOF
***************
*** 113,116 ****
--- 120,124 ----
                                Source          = etc/cron.daily/ulogd
                                Filename        = etc/cron.daily/ulogd
+                               Type            = local
                                Type            = binary
                                Permissions = 755
***************
*** 119,122 ****
--- 127,131 ----
                                Source          = etc/cron.weekly/ulogd
                                Filename        = etc/cron.weekly/ulogd
+                               Type            = local
                                Type            = binary
                                Permissions = 755
***************
*** 124,126 ****
--- 133,165 ----
                </Contents>                     
        </ulogd>
+       <ulogdsql>
+               Version = 1.24
+               Revision = 1
+ 
+               Help <<EOF
+               MySQL plugin for the Netfilter Userspace Logging Daemon
+               Homepage: http://www.gnumonks.org/projects/ulogd
+               Requires: ulogd.lrp, libmysql.lrp
+               LEAF package by __PACKAGER__, __BUILDDATE__             
+               EOF
+               
+               <Permissions>
+                       Files = 644
+                       Directories = 755
+               </Permissions>
+ 
+               <Owner>
+                       Files = root:root
+                       Directories = root:root
+               </Owner>
+               
+               <Contents>
+                       <File>          
+                               Source          = usr/lib/ulogd/ulogd_MYSQL.so
+                               Filename        = usr/lib/ulogd/ulogd_MYSQL.so
+                               Type            = binary
+                               Permissions = 755
+                       </File>         
+               </Contents>                     
+       </ulogdsql>
  </Package>

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/ulogd/buildtool.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** buildtool.mk        15 Feb 2006 20:45:24 -0000      1.9
--- buildtool.mk        29 Nov 2006 21:40:10 -0000      1.10
***************
*** 5,11 ****
--- 5,14 ----
  ULOGD_TARGET_DIR:=$(BT_BUILD_DIR)/ulogd
  
+ export AUTOCONF=$(BT_STAGING_DIR)/bin/autoconf
+ 
  $(ULOGD_DIR)/.source:
        bzcat $(ULOGD_SOURCE) | tar -xvf -
        cat $(ULOGD_PATCH1) | patch -d $(ULOGD_DIR) -p1
+       cat $(ULOGD_PATCH2) | patch -d $(ULOGD_DIR) -p1
        touch $(ULOGD_DIR)/.source
  
***************
*** 13,20 ****
                          
  $(ULOGD_DIR)/.configured: $(ULOGD_DIR)/.source
-       (cd $(ULOGD_DIR) ; CC=$(TARGET_CC) LD=$(TARGET_LD) 
CFLAGS="$(BT_COPT_FLAGS) -I$(BT_LINUX_DIR)/include" \
-       ./configure --prefix=/usr --sysconfdir=/etc )
  #     (cd $(ULOGD_DIR) ; CC=$(TARGET_CC) LD=$(TARGET_LD) 
CFLAGS="$(BT_COPT_FLAGS) -I$(BT_LINUX_DIR)/include" \
! #     ./configure --prefix=/usr --sysconfdir=/etc 
--with-mysql=$(BT_STAGING_DIR)/usr )
        touch $(ULOGD_DIR)/.configured
                                                                   
--- 16,23 ----
                          
  $(ULOGD_DIR)/.configured: $(ULOGD_DIR)/.source
  #     (cd $(ULOGD_DIR) ; CC=$(TARGET_CC) LD=$(TARGET_LD) 
CFLAGS="$(BT_COPT_FLAGS) -I$(BT_LINUX_DIR)/include" \
! #     ./configure --prefix=/usr --sysconfdir=/etc )
!       (cd $(ULOGD_DIR) ; $(AUTOCONF) ; CC=$(TARGET_CC) LD=$(TARGET_LD) 
CFLAGS="$(BT_COPT_FLAGS) -I$(BT_LINUX_DIR)/include" \
!       ./configure --prefix=/usr --sysconfdir=/etc 
--with-mysql=$(BT_STAGING_DIR)/usr )
        touch $(ULOGD_DIR)/.configured
                                                                   

--- NEW FILE: ulogd-configure.patch ---
diff -urN ulogd-1.24.orig/configure.in ulogd-1.24/configure.in
--- ulogd-1.24.orig/configure.in        2005-11-25 20:58:27.000000000 +0100
+++ ulogd-1.24/configure.in     2006-02-15 21:54:48.000000000 +0100
@@ -83,7 +83,7 @@
 
        AC_MSG_CHECKING(for mysql_real_escape_string support)
 
-       MYSQL_FUNCTION_TEST=`strings ${MYSQLLIBS}/libmysqlclient.so | grep 
mysql_real_escape_string`
+       MYSQL_FUNCTION_TEST=`strings ${dir}/lib/libmysqlclient.so | grep 
mysql_real_escape_string`
 
        if test "x$MYSQL_FUNCTION_TEST" = x
        then


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits

Reply via email to