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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   25-Jun-2004 23:21:02
  Branch: HEAD                             Handle: -NONE-

  Added files:
    openpkg-src/libcrack    Makefile
  Modified files:
    openpkg-src/libcrack    libcrack.spec

  Log:
    fix passing of make(1) variables; place files into subdir; use
    namespace clean names for tools; add Makefile for regeneration of
    files; add more dictionaries; install more tools

  Summary:
    Revision    Changes     Path
    1.1         +10 -0      openpkg-src/libcrack/Makefile
    1.2         +0  -0      openpkg-src/libcrack/libcrack.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/libcrack/Makefile
  ============================================================================
  $ cvs diff -u -r0 -r1.1 Makefile
  --- /dev/null 2004-06-25 23:21:01.000000000 +0200
  +++ Makefile  2004-06-25 23:21:01.000000000 +0200
  @@ -0,0 +1,10 @@
  +
  +PREFIX  = @l_prefix@
  +LIBDIR  = $(PREFIX)/lib/libcrack
  +DICTDIR = $(PREFIX)/share/libcrack
  +MKDICT  = $(PREFIX)/sbin/cracklib-mkdict
  +PACKER  = $(PREFIX)/sbin/cracklib-packer
  +
  +all:
  +     $(MKDICT) $(DICTDIR)/*.txt | $(PACKER) $(LIBDIR)/pw_dict
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/libcrack/libcrack.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 libcrack.spec
  --- openpkg-src/libcrack/libcrack.spec        18 Jun 2004 10:32:29 -0000      1.1
  +++ openpkg-src/libcrack/libcrack.spec        25 Jun 2004 21:21:00 -0000      1.2
  @@ -25,7 +25,7 @@
   
   #   package information
   Name:         libcrack
  -Summary:      Filter guessable passwords
  +Summary:      Filter Guessable Passwords
   URL:          http://www.crypticide.com/users/alecm/
   Vendor:       Alec Muffett
   Packager:     The OpenPKG Project
  @@ -34,11 +34,16 @@
   Group:        Security
   License:      Artistic
   Version:      2.7
  -Release:      20040618
  +Release:      20040625
   
   #   list of sources
   Source0:      
http://www.crypticide.com/users/alecm/security/cracklib,%{version}.tar.gz
   Source1:      
ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/common-passwords.txt.gz
  +Source2:      ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Jargon.gz
  +Source3:      http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/share/dict/web2
  +Source4:      http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/share/dict/web2a
  +Source5:      
http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/share/dict/propernames
  +Source6:      Makefile
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -63,26 +68,28 @@
   %prep
       %setup -q -n cracklib,%{version}
       %{l_shtool} subst \
  -        -e 's;^\(DICTPATH\)=.*$;\1=$$DESTDIR%{l_prefix}/lib/pw_dict;' \
  -        -e 's;^\(SRCDICTS\)=.*$;\1=$$DESTDIR%{l_prefix}/share/libcrack/*;' \
  +        -e 's;^\(DICTPATH\)=.*$;\1=$(DESTDIR)%{l_prefix}/lib/libcrack/pw_dict;' \
  +        -e 's;^\(SRCDICTS\)=.*$;\1=$(DESTDIR)%{l_prefix}/share/libcrack/*;' \
           Makefile
       %{l_shtool} mkdir -f -p -m 755 share
  -    %{l_shtool} install -c -m 644 %{SOURCE1} share/
  -    %{l_prefix}/bin/gunzip share/*.gz
  +    %{l_gzip} -d -c %{SOURCE common-passwords.txt.gz} >share/passwords.txt
  +    %{l_gzip} -d -c %{SOURCE Jargon.gz} >share/jargon.txt
  +    cp %{SOURCE web2} share/web2.txt
  +    cp %{SOURCE web2a} share/web2a.txt
  +    cp %{SOURCE propernames} share/propernames.txt
   
   %build
  -    CC="%{l_cc}" \
  -    CFLAGS="%{l_cflags -O}" \
  -    LDFLAGS="%{l_ldflags}" \
  -    %{l_make} %{l_mflags -O} all
  +    %{l_make} %{l_mflags -O} all \
  +        CC="%{l_cc} %{l_cflags -O}" \
  +        LDFLAGS="%{l_ldflags}"
   
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix} \
  -        $RPM_BUILD_ROOT%{l_prefix}/include \
  -        $RPM_BUILD_ROOT%{l_prefix}/lib \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/sbin \
  +        $RPM_BUILD_ROOT%{l_prefix}/include \
  +        $RPM_BUILD_ROOT%{l_prefix}/lib/libcrack \
           $RPM_BUILD_ROOT%{l_prefix}/share/libcrack
       %{l_shtool} install -c -m 644 \
           cracklib/packer.h \
  @@ -93,10 +100,16 @@
       %{l_shtool} install -c -m 644 \
           share/* \
           $RPM_BUILD_ROOT%{l_prefix}/share/libcrack/
  +    %{l_shtool} install -c -m 644 %{l_value -s -a} \
  +        %{SOURCE Makefile} $RPM_BUILD_ROOT%{l_prefix}/share/libcrack/
       %{l_shtool} install -c -m 755 \
  -        util/mkdict util/packer \
  -        $RPM_BUILD_ROOT%{l_prefix}/sbin/
  -    strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
  +        util/mkdict $RPM_BUILD_ROOT%{l_prefix}/sbin/cracklib-mkdict
  +    %{l_shtool} install -c -s -m 755 \
  +        util/packer $RPM_BUILD_ROOT%{l_prefix}/sbin/cracklib-packer
  +    %{l_shtool} install -c -s -m 755 \
  +        util/unpacker $RPM_BUILD_ROOT%{l_prefix}/sbin/cracklib-unpacker
  +    %{l_shtool} install -c -s -m 755 \
  +        util/testlib $RPM_BUILD_ROOT%{l_prefix}/bin/cracklib-test
       %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to