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:   09-Oct-2007 15:46:54
  Branch: HEAD                             Handle: 2007100914465301

  Modified files:
    openpkg-src/cracklib    Makefile cracklib.spec

  Log:
    repackage from scratch for newer cracklib 2.8.x

  Summary:
    Revision    Changes     Path
    1.2         +2  -2      openpkg-src/cracklib/Makefile
    1.10        +70 -53     openpkg-src/cracklib/cracklib.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/cracklib/Makefile
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 Makefile
  --- openpkg-src/cracklib/Makefile     25 Jun 2004 21:21:00 -0000      1.1
  +++ openpkg-src/cracklib/Makefile     9 Oct 2007 13:46:53 -0000       1.2
  @@ -2,9 +2,9 @@
   PREFIX  = @l_prefix@
   LIBDIR  = $(PREFIX)/lib/cracklib
   DICTDIR = $(PREFIX)/share/cracklib
  -MKDICT  = $(PREFIX)/sbin/cracklib-mkdict
  +FORMAT  = $(PREFIX)/sbin/cracklib-format
   PACKER  = $(PREFIX)/sbin/cracklib-packer
   
   all:
  -     $(MKDICT) $(DICTDIR)/*.txt | $(PACKER) $(LIBDIR)/pw_dict
  +     $(FORMAT) $(DICTDIR)/*.txt | $(PACKER) $(LIBDIR)/pw_dict
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cracklib/cracklib.spec
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 cracklib.spec
  --- openpkg-src/cracklib/cracklib.spec        1 Jan 2007 17:37:09 -0000       
1.9
  +++ openpkg-src/cracklib/cracklib.spec        9 Oct 2007 13:46:54 -0000       
1.10
  @@ -25,30 +25,31 @@
   #   package information
   Name:         cracklib
   Summary:      Filter Guessable Passwords
  -URL:          http://www.crypticide.com/users/alecm/
  -Vendor:       Alec Muffett
  +URL:          http://cracklib.sourceforge.net/
  +Vendor:       Alec Muffett et al.
   Packager:     OpenPKG Foundation e.V.
   Distribution: OpenPKG Community
   Class:        PLUS
   Group:        Security
   License:      Artistic
  -Version:      2.7
  -Release:      20061013
  +Version:      2.8.12
  +Release:      20071009
   
   #   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
  +Source0:      
http://switch.dl.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
  +Source1:      http://switch.dl.sourceforge.net/cracklib/cracklib-words.gz
  +Source2:      
ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/common-passwords.txt.gz
  +Source3:      
ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Jargon.gz
  +Source4:      
http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/share/dict/web2
  +Source5:      
http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/share/dict/web2a
  +Source6:      
http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/share/dict/propernames
  +Source7:      Makefile
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  OpenPKG, openpkg >= 20040130, make
  +PreReq:       OpenPKG, openpkg >= 20040130, make
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -60,56 +61,59 @@
   %track
       prog cracklib = {
           version   = %{version}
  -        url       = http://www.crypticide.com/users/alecm/security/
  -        regex     = cracklib,(__VER__)\.tar\.gz
  +        url       = http://prdownloads.sourceforge.net/cracklib/
  +        regex     = cracklib-(__VER__)\.tar\.gz
       }
   
   %prep
  -    %setup -q -n cracklib,%{version}
  -    %{l_shtool} subst \
  -        -e 
's;^\(DICTPATH\)=.*$;\1=$(DESTDIR)%{l_prefix}/lib/cracklib/pw_dict;' \
  -        -e 's;^\(SRCDICTS\)=.*$;\1=$(DESTDIR)%{l_prefix}/share/cracklib/*;' \
  -        Makefile
  -    %{l_shtool} mkdir -f -p -m 755 share
  -    %{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
  +    %setup -q
   
   %build
  -    %{l_make} %{l_mflags -O} all \
  -        CC="%{l_cc} %{l_cflags -O}" \
  -        LDFLAGS="%{l_ldflags}"
  +    #   configure library
  +    CC="%{l_cc}" \
  +    CFLAGS="%{l_cflags -O}" \
  +    ./configure \
  +        --prefix=%{l_prefix} \
  +        --with-default-dict=%{l_prefix}/lib/cracklib/pw_dict \
  +        --without-python \
  +        --disable-shared \
  +        --disable-nls
  +
  +    #   build library
  +    %{l_make} %{l_mflags}
   
   %install
  +    #   install library
       rm -rf $RPM_BUILD_ROOT
  -    %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/sbin \
  -        $RPM_BUILD_ROOT%{l_prefix}/include \
  -        $RPM_BUILD_ROOT%{l_prefix}/lib/cracklib \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/cracklib
  -    %{l_shtool} install -c -m 644 \
  -        cracklib/packer.h \
  -        $RPM_BUILD_ROOT%{l_prefix}/include/
  -    %{l_shtool} install -c -m 644 \
  -        cracklib/libcrack.a \
  -        $RPM_BUILD_ROOT%{l_prefix}/lib/
  -    %{l_shtool} install -c -m 644 \
  -        share/* \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/cracklib/
  +    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
  +
  +    #   strip down installation files
  +    rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/create-cracklib-dict
  +    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/cracklib/cracklib.magic
  +
  +    #   install dictionaries
  +    mv  $RPM_BUILD_ROOT%{l_prefix}/share/cracklib/cracklib-small \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/cracklib/cracklib-small.txt
  +    %{l_gzip} -d -c %{SOURCE cracklib-words.gz} \
  +        >$RPM_BUILD_ROOT%{l_prefix}/share/cracklib/cracklib-large.txt
  +    %{l_gzip} -d -c %{SOURCE common-passwords.txt.gz} \
  +        >$RPM_BUILD_ROOT%{l_prefix}/share/cracklib/common-passwords.txt
  +    %{l_gzip} -d -c %{SOURCE Jargon.gz} \
  +        >$RPM_BUILD_ROOT%{l_prefix}/share/cracklib/jargon-words.txt
  +    cp %{SOURCE web2} \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/cracklib/freebsd-web2.txt
  +    cp %{SOURCE web2a} \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/cracklib/freebsd-web2a.txt
  +    cp %{SOURCE propernames} \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/cracklib/freebsd-propernames.txt
  +
  +    #   install dictionary generation stuff
       %{l_shtool} install -c -m 644 %{l_value -s -a} \
           %{SOURCE Makefile} $RPM_BUILD_ROOT%{l_prefix}/share/cracklib/
  -    %{l_shtool} install -c -m 755 \
  -        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_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/lib/cracklib
  +
  +    #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
  @@ -117,3 +121,16 @@
   %clean
       rm -rf $RPM_BUILD_ROOT
   
  +%post
  +    #   (re-)generate run-time password dictionary
  +    ( echo "(Re-)Generating run-time password dictionary"
  +    ) | %{l_rpmtool} msg -b -t warn
  +    ( cd $RPM_INSTALL_PREFIX/share/cracklib && \
  +      $RPM_INSTALL_PREFIX/bin/make
  +    ) >/dev/null 2>&1
  +
  +%preun
  +    if [ $1 -eq 0 ]; then
  +        rm -f $RPM_INSTALL_PREFIX/share/cracklib/* >/dev/null 2>&1 || true
  +    fi
  +
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to