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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   07-May-2006 08:59:08
  Branch: HEAD                             Handle: 2006050707590800

  Modified files:
    openpkg-src/ratbox      ratbox.patch ratbox.spec

  Log:
    add new challenge/response client

  Summary:
    Revision    Changes     Path
    1.23        +12 -0      openpkg-src/ratbox/ratbox.patch
    1.31        +32 -5      openpkg-src/ratbox/ratbox.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ratbox/ratbox.patch
  ============================================================================
  $ cvs diff -u -r1.22 -r1.23 ratbox.patch
  --- openpkg-src/ratbox/ratbox.patch   14 Mar 2006 07:16:55 -0000      1.22
  +++ openpkg-src/ratbox/ratbox.patch   7 May 2006 06:59:08 -0000       1.23
  @@ -22,3 +22,15 @@
    
    /* SMALL_NETWORK
     * If your network is fairly small, enable this to save some memory.
  +Index: ratbox-respond-1.0/ratbox-respond/configure
  +--- ratbox-respond-1.0/ratbox-respond/configure.orig 2006-01-11 22:52:17 
+0100
  ++++ ratbox-respond-1.0/ratbox-respond/configure      2006-05-07 08:55:33 
+0200
  +@@ -2889,8 +2889,6 @@
  + fi
  + 
  + 
  +-CPPFLAGS="-I /usr/include"
  +-LIBS="-L /usr/lib"
  + 
  + echo "$as_me:$LINENO: checking for OpenSSL" >&5
  + echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ratbox/ratbox.spec
  ============================================================================
  $ cvs diff -u -r1.30 -r1.31 ratbox.spec
  --- openpkg-src/ratbox/ratbox.spec    14 Mar 2006 07:16:56 -0000      1.30
  +++ openpkg-src/ratbox/ratbox.spec    7 May 2006 06:59:08 -0000       1.31
  @@ -25,6 +25,7 @@
   #   package version
   %define       V_server   2.1.7
   %define       V_services 1.0.3
  +%define       V_respond  1.0
   
   #   package information
   Name:         ratbox
  @@ -37,15 +38,16 @@
   Group:        Network
   License:      GPL
   Version:      %{V_server}
  -Release:      20060314
  +Release:      20060507
   
   #   list of sources
   Source0:      
ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ircd-ratbox-%{V_server}.tgz
   Source1:      
ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ratbox-services/ratbox-services-%{V_services}.tgz
  -Source2:      rc.ratbox
  -Source3:      ratbox-server.conf
  -Source4:      ratbox-services.conf
  -Source5:      ratbox-resv.conf
  +Source2:      
ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ratbox-respond/ratbox-respond-%{V_respond}.tgz
  +Source3:      rc.ratbox
  +Source4:      ratbox-server.conf
  +Source5:      ratbox-services.conf
  +Source6:      ratbox-resv.conf
   Patch0:       ratbox.patch
   
   #   build information
  @@ -75,10 +77,16 @@
           url       = 
ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ratbox-services/
           regex     = ratbox-services-(__VER__)\.tgz
       }
  +    prog ratbox:respond = {
  +        version   = %{V_respond}
  +        url       = ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ratbox-respond/
  +        regex     = ratbox-respond-(__VER__)\.tgz
  +    }
   
   %prep
       %setup -q -c
       %setup -q -T -D -a 1
  +    %setup -q -T -D -a 2
       %patch -p0
   
   %build
  @@ -131,6 +139,17 @@
         %{l_make} %{l_mflags}
       ) || exit $?
   
  +    #   build IRC challenge/response client
  +    ( cd ratbox-respond-%{V_respond}/ratbox-respond
  +      CC="%{l_cc}" \
  +      CFLAGS="%{l_cflags -O}" \
  +      CPPFLAGS="%{l_cppflags}" \
  +      LDFLAGS="%{l_ldflags}" \
  +      ./configure \
  +          --prefix=%{l_prefix}
  +      %{l_make} %{l_mflags}
  +    ) || exit $?
  +
   %install
       rm -rf $RPM_BUILD_ROOT
   
  @@ -175,6 +194,14 @@
         chmod a+r $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/schema.txt
       ) || exit $?
   
  +    #   install IRC challenge/response client
  +    ( cd ratbox-respond-%{V_respond}
  +      %{l_shtool} install -c -m 755 \
  +          makekeypair $RPM_BUILD_ROOT%{l_prefix}/bin/ratbox-makekeypair
  +      %{l_shtool} install -c -s -m 755 \
  +          ratbox-respond/ratbox-respond $RPM_BUILD_ROOT%{l_prefix}/bin/
  +    ) || exit $?
  +
       #   post-adjust installation
       rmdir $RPM_BUILD_ROOT%{l_prefix}/libexec/ratbox-old
       rmdir $RPM_BUILD_ROOT%{l_prefix}/share/ratbox-old
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to