[Lunar-commits] CVS: moonbase/crypto/util-linux-crypto POST_INSTALL, NONE, 1.1 make-issue, NONE, 1.1 BUILD, 1.1.1.1, 1.2 DEPENDS, 1.1.1.1, 1.2 DETAILS, 1.1.1.1, 1.2 PRE_BUILD, 1.1.1.1, NONE bootmisc, 1.1.1.1, NONE

[Terry Chan]

Update of /var/cvs/lunar/moonbase/crypto/util-linux-crypto
In directory dbguin.lunar-linux.org:/tmp/cvs-serv5857

Modified Files:
	BUILD DEPENDS DETAILS 
Added Files:
	POST_INSTALL make-issue 
Removed Files:
	PRE_BUILD bootmisc 
Log Message:
Updated at the request of bramble.  Also fixed this module to be more like
util-linux and the recent changes that have gone into that module.  Compiled
and tested with gcc-3.2.3, kernel-2.4.x headers.


--- NEW FILE: POST_INSTALL ---
if ! [ -d /etc/init.d ]; then
     mkdir -p /etc/init.d
fi

if [ -s /etc/init.d/bootmisc.sh ]; then
   mv /etc/init.d/bootmisc.sh /etc/init.d/bootmisc
   rm -f /etc/rcS.d/S99bootmisc
   ln -s /etc/init.d/bootmisc /etc/rcS.d/S99bootmisc
fi

if ! [ -e /etc/init.d/bootmisc  ];  then
  cp  $SCRIPT_DIRECTORY/init.d/bootmisc  /etc/init.d
  rm -f /etc/rcS.d/S99bootmisc
  ln -s /etc/init.d/bootmisc /etc/rcS.d/S99bootmisc
fi

if [ ! -e /etc/rcS.d/S99bootmisc ] ; then
  ln -s /etc/init.d/bootmisc /etc/rcS.d/S99bootmisc
fi

if ! grep -q "^issu::once:/sbin/make-issue" /etc/inittab ; then
  echo "issu::once:/sbin/make-issue" >> /etc/inittab
fi


--- NEW FILE: make-issue ---
#!/bin/bash

for ISSUE in /etc/issue /etc/issue.net ; do
  if [ -f /etc/lunar.release ] ; then
    cat /etc/lunar.release > $ISSUE
  else
    echo "Lunar Linux 1.3.3 (Pvt. Variables)" > $ISSUE
  fi
  echo "Kernel `uname -r` on an `uname -m`" >> $ISSUE
  echo "" >> $ISSUE
done


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/crypto/util-linux-crypto/BUILD,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- BUILD	21 Aug 2002 00:55:11 -0000	1.1.1.1
+++ BUILD	25 Jan 2004 20:00:39 -0000	1.2
@@ -1,28 +1,25 @@
-sedit  "s/HAVE_SLN=no/HAVE_SLN=yes/"   MCONFIG
-sedit  "s/# ADD_RAW=yes/ADD_RAW=yes/"  MCONFIG
-sedit  "s/\$(OPT)//"                   MCONFIG
 (
 
-  patch  -p1  < cryptoapi-2.4.7.0/doc/util-linux-2.11b.patch
+  sedit  "s/HAVE_SLN=no/HAVE_SLN=yes/"   MCONFIG &&
+  sedit  "s/\$(OPT)//"                   MCONFIG &&
+  sedit  "s,linux/raw.h,sys/raw.h,"      disk-utils/raw.c &&
+  
+  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+  patch_it $SOURCE_CACHE/$SOURCE3 1 &&
 
  ./configure  --build=$BUILD           \
               --prefix=/usr            &&
   make                                 &&
   if    module_installed      util-linux
   then  lrm      --nosustain  util-linux
-  fi                                   &&
+  fi                                          &&
   prepare_install                      &&
   make    install
 
-) > $C_FIFO 2>&1  &&
+  mkdir -p $DOCUMENT_DIRECTORY/util-linux     &&
+  cp -a HISTORY example.files $DOCUMENT_DIRECTORY/util-linux   &&
+  install -g0 -o0 -m755 $SCRIPT_DIRECTORY/make-issue \
+    /sbin/make-issue
 
-if [ -e /etc/init.d/bootmisc.sh ]; then
-   rm -f /etc/init.d/bootmisc.sh
-   cp $SCRIPT_DIRECTORY/bootmisc  /etc/init.d
-elif ! [ -x /etc/init.d/bootmisc ]; then
-  cp $SCRIPT_DIRECTORY/bootmisc /etc/init.d
-fi
+) > $C_FIFO 2>&1
 
-if ! [ -e /etc/rcS.d/S99bootmisc ]; then
-     ln -s /etc/init.d/bootmisc /etc/rcS.d/S99bootmisc
-fi

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/crypto/util-linux-crypto/DEPENDS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DEPENDS	21 Aug 2002 00:55:11 -0000	1.1.1.1
+++ DEPENDS	25 Jan 2004 20:00:39 -0000	1.2
@@ -1 +1 @@
-depends  cryptoapi
+depends  ncurses

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/crypto/util-linux-crypto/DETAILS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DETAILS	21 Aug 2002 00:55:11 -0000	1.1.1.1
+++ DETAILS	25 Jan 2004 20:00:39 -0000	1.2
@@ -1,14 +1,15 @@
           MODULE=util-linux-crypto
-         VERSION=2.11n
+         VERSION=2.11r
           SOURCE=util-linux-$VERSION.tar.bz2
-         SOURCE2=cryptoapi-2.4.7.0.tar.gz
+         SOURCE2=util-linux-$VERSION.patch.bz2
+         SOURCE3=util-linux-$VERSION-crypto-errno.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/util-linux-$VERSION
-#   SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$MODULE/$SOURCE
    SOURCE_URL[0]=http://www.kernel.org/pub/linux/utils/util-linux/$SOURCE
   SOURCE2_URL[0]=$SFORGE_URL/cryptoapi/$SOURCE2
-        WEB_SITE=ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux
+  SOURCE3_URL[0]=$PATCH_URL/$SOURCE3
+        WEB_SITE=http://www.kerneli.org:8080/cryptoapi
          ENTERED=20010924
-         UPDATED=20011211
+         UPDATED=20040125
            SHORT="util-linux contains essential utilities for any Linux box."
 cat << EOF
 Util-linux is a suite of essential utilities for any Linux system. Its

--- PRE_BUILD DELETED ---

--- bootmisc DELETED ---