OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   08-Jan-2003 15:58:35
  Branch: HEAD                             Handle: 2003010814583401

  Added files:
    openpkg-src/chkrootkit  chkrootkit.patch
  Modified files:
    openpkg-src/chkrootkit  chkrootkit.spec
    openpkg-web             news.txt

  Log:
    Fix flawed packaging for all platforms, and add a patch to civilize
    the nasty makefile.

  Summary:
    Revision    Changes     Path
    1.1         +60 -0      openpkg-src/chkrootkit/chkrootkit.patch
    1.7         +7  -5      openpkg-src/chkrootkit/chkrootkit.spec
    1.2601      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/chkrootkit/chkrootkit.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 chkrootkit.patch
  --- /dev/null 2003-01-08 15:58:35.000000000 +0100
  +++ chkrootkit.patch  2003-01-08 15:58:35.000000000 +0100
  @@ -0,0 +1,60 @@
  +diff -Naur chkrootkit-0.38.orig/Makefile chkrootkit-0.38/Makefile
  +--- chkrootkit-0.38.orig/Makefile    2002-12-06 03:07:29.000000000 +0100
  ++++ chkrootkit-0.38/Makefile 2003-01-08 15:16:54.329170000 +0100
  +@@ -34,31 +34,31 @@
  + sense: chklastlog chkwtmp ifpromisc chkproc chkdirs check_wtmpx strings
  + 
  + chklastlog:   chklastlog.c
  +-    ${CC} ${CFLAGS} -o $@ chklastlog.c
  ++    ${CC} ${CFLAGS} ${LDFLAGS} -o $@ chklastlog.c ${LIBS}
  +     @strip $@
  + 
  + chkwtmp:   chkwtmp.c
  +-    ${CC} ${CFLAGS} -o $@ chkwtmp.c
  ++    ${CC} ${CFLAGS} ${LDFLAGS} -o $@ chkwtmp.c ${LIBS}
  +     @strip $@
  + 
  + ifpromisc:   ifpromisc.c
  +-    ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ifpromisc.c
  ++    ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ifpromisc.c ${LIBS}
  +     @strip $@
  + 
  + chkproc:   chkproc.c
  +-    ${CC} ${LDFLAGS} -o $@ chkproc.c
  ++    ${CC} ${CFLAGS} ${LDFLAGS} -o $@ chkproc.c ${LIBS}
  +     @strip $@
  + 
  + chkdirs:   chkdirs.c
  +-    ${CC} ${LDFLAGS} -o $@ chkdirs.c
  ++    ${CC} ${CFLAGS} ${LDFLAGS} -o $@ chkdirs.c ${LIBS}
  +     @strip $@
  + 
  + check_wtmpx:   check_wtmpx.c
  +-    ${CC} ${LDFLAGS} -o $@ check_wtmpx.c
  ++    ${CC} ${CFLAGS} ${LDFLAGS} -o $@ check_wtmpx.c ${LIBS}
  +     @strip $@
  + 
  + strings:   strings.c
  +-    ${CC} ${STATIC} ${LDFLAGS} -o $@ strings.c
  ++    ${CC} ${STATIC} ${CFLAGS} ${LDFLAGS} -o $@ strings.c ${LIBS}
  +     @strip $@
  + 
  + clean:
  +diff -Naur chkrootkit-0.38.orig/chkdirs.c chkrootkit-0.38/chkdirs.c
  +--- chkrootkit-0.38.orig/chkdirs.c   2002-12-21 00:40:20.000000000 +0100
  ++++ chkrootkit-0.38/chkdirs.c        2003-01-08 15:43:52.518334000 +0100
  +@@ -32,6 +32,14 @@
  + #include <string.h>
  + #include <errno.h>
  + 
  ++#ifndef NAME_MAX
  ++#define NAME_MAX 14
  ++#endif
  ++
  ++#ifndef PATH_MAX
  ++#define PATH_MAX 1024
  ++#endif
  ++
  + struct dirinfolist {
  +   char                   dil_name[NAME_MAX+1];
  +   int                    dil_lc;
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/chkrootkit/chkrootkit.spec
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 chkrootkit.spec
  --- openpkg-src/chkrootkit/chkrootkit.spec    3 Jan 2003 10:51:26 -0000       1.6
  +++ openpkg-src/chkrootkit/chkrootkit.spec    8 Jan 2003 14:58:35 -0000       1.7
  @@ -33,10 +33,11 @@
   Group:        System
   License:      GPL
   Version:      0.38
  -Release:      20030102
  +Release:      20030108
   
   #   list of sources
   Source0:      ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-%{version}.tar.gz
  +Patch0:       chkrootkit.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -55,19 +56,20 @@
   
   %prep
       %setup -q
  +    %patch -p1
   
   %build
       CC="%{l_cc}"
  -    CFLAGS="%{l_cflags -O} -static"
  +    CFLAGS="%{l_cflags -O} -DHAVE_LASTLOG_H"
       LDFLAGS="%{l_ldflags}"
  -    CFLAGS="$CFLAGS -DHAVE_LASTLOG_H"
       case "%{l_target}" in
           *-solaris* )
               CFLAGS="$CFLAGS -DSOLARIS2"
  -            LDFLAGS="$LDFLAGS -lsocket"
  +            STATIC="-B static"
  +            LIBS="$LIBS -lsocket -ldl"
               ;;
       esac
  -    %{l_make} %{l_mflags} CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
  +    %{l_make} %{l_mflags} CC=$CC CFLAGS="$CFLAGS" STATIC="$STATIC" 
LDFLAGS="$LDFLAGS" LIBS="$LIBS"
   
   %install
       rm -rf $RPM_BUILD_ROOT
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.2600 -r1.2601 news.txt
  --- openpkg-web/news.txt      8 Jan 2003 14:41:52 -0000       1.2600
  +++ openpkg-web/news.txt      8 Jan 2003 14:58:34 -0000       1.2601
  @@ -1,3 +1,4 @@
  +08-Jan-2003: Upgraded package: P<chkrootkit-0.38-20030108>
   08-Jan-2003: Upgraded package: P<j2se-1.3.1-20030108>
   08-Jan-2003: Upgraded package: P<openpkg-20030108-20030108>
   08-Jan-2003: Upgraded package: P<pam-20030108-20030108>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to