diff --git a/Documentation/Developers/REGISTER b/Documentation/Developers/REGISTER index 4f959c256..f92b2bcb4 100644 --- a/Documentation/Developers/REGISTER +++ b/Documentation/Developers/REGISTER @@ -2,6 +2,18 @@ Reserved User and Group IDs: ---------------------------- + - system users: - system groups: + root 0 root 0 + toor 0 bin 1 + bin 1 daemon 2 + daemon 2 shadow 3 + log 9 games 4 + tty 5 + disk 6 + kmem 7 + mail 8 + log 9 + - uucp users: - uucp groups: uucp 14 uucp 14 diff --git a/package/base/uml_utilities/uml_utilities.desc b/package/base/uml_utilities/uml_utilities.desc index 6391c583e..f3741bbb9 100644 --- a/package/base/uml_utilities/uml_utilities.desc +++ b/package/base/uml_utilities/uml_utilities.desc @@ -37,5 +37,5 @@ [V] 20040114 [P] X ---3-----9 712.400 -[D] 0 uml_utilities_20040114.tar.bz2 http://dl.sourceforge.net/sourceforge/user-mode-linux/ +[D] 1503699049 uml_utilities_20040114.tar.bz2 http://dl.sourceforge.net/sourceforge/user-mode-linux/ diff --git a/package/mnemoc/gtk-sharp/gtk-sharp.desc b/package/mnemoc/gtk-sharp/gtk-sharp.desc index c6bf734d7..198d311d0 100644 --- a/package/mnemoc/gtk-sharp/gtk-sharp.desc +++ b/package/mnemoc/gtk-sharp/gtk-sharp.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 0.16 +[V] 0.17 [P] X -----5---9 562.000 -[D] 2028144732 gtk-sharp-0.16.tar.gz http://dl.sourceforge.net/sourceforge/gtk-sharp/ +[D] 1914376999 gtk-sharp-0.17.tar.gz http://dl.sourceforge.net/sourceforge/gtk-sharp/ diff --git a/package/mnemoc/keepalived/keepalived.desc b/package/mnemoc/keepalived/keepalived.desc index 5a03c079d..a5d6b9188 100644 --- a/package/mnemoc/keepalived/keepalived.desc +++ b/package/mnemoc/keepalived/keepalived.desc @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 1.1.5 +[V] 1.1.6 [P] X -----5---9 790.000 -[D] 3998585280 keepalived-1.1.5.tar.gz http://keepalived.sourceforge.net/software/ +[D] 538012670 keepalived-1.1.6.tar.gz http://keepalived.sourceforge.net/software/ diff --git a/package/mnemoc/mono-doc/mono-doc.desc b/package/mnemoc/mono-doc/mono-doc.desc index 6f3e19b37..15d081697 100644 --- a/package/mnemoc/mono-doc/mono-doc.desc +++ b/package/mnemoc/mono-doc/mono-doc.desc @@ -37,9 +37,9 @@ [L] GPL [S] Stable -[V] 0.10 +[V] 0.11 [P] X -----5---9 861.000 [CV-URL] http://www.go-mono.com/download.html -[D] 643945150 monodoc-0.10.tar.gz http://www.go-mono.org/archive/ +[D] 3434747926 monodoc-0.11.tar.gz http://www.go-mono.org/archive/ diff --git a/package/mnemoc/mono/mono.desc b/package/mnemoc/mono/mono.desc index 7d5b68556..cdfabac31 100644 --- a/package/mnemoc/mono/mono.desc +++ b/package/mnemoc/mono/mono.desc @@ -41,12 +41,12 @@ [L] GPL [S] Stable -[V] 0.30 +[V] 0.30.1 [P] X -----5---9 492.000 [CV-URL] http://www.go-mono.com/download.html -[D] 2362402862 mono-0.30.tar.gz http://www.go-mono.com/archive/ -[D] 3213418423 mcs-0.30.tar.gz http://www.go-mono.com/archive/ +[D] 255742828 mono-0.30.1.tar.gz http://www.go-mono.com/archive/ +[D] 3694904385 mcs-0.30.1.tar.gz http://www.go-mono.com/archive/ [SRC] . diff --git a/package/mnemoc/openldap/openldap.desc b/package/mnemoc/openldap/openldap.desc index ecd57ba48..374939830 100644 --- a/package/mnemoc/openldap/openldap.desc +++ b/package/mnemoc/openldap/openldap.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 2.1.26 +[V] 2.1.27 [P] X -----5---9 671.000 -[D] 2126123478 openldap-2.1.26.tgz ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ +[D] 1962919129 openldap-2.1.27.tgz ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ diff --git a/package/mnemoc/phppgadmin/phppgadmin.desc b/package/mnemoc/phppgadmin/phppgadmin.desc index a780bbc9f..a694d3471 100644 --- a/package/mnemoc/phppgadmin/phppgadmin.desc +++ b/package/mnemoc/phppgadmin/phppgadmin.desc @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 3.2.1 +[V] 3.3 [P] X -----5---9 800.000 -[D] 3030525527 phpPgAdmin-3.2.1.tar.bz2 http://dl.sourceforge.net/sourceforge/phppgadmin/ +[D] 2570673368 phpPgAdmin-3.3.tar.bz2 http://dl.sourceforge.net/sourceforge/phppgadmin/ diff --git a/package/mnemoc/runit/djb-config b/package/mnemoc/runit/djb-config index a3bf90e8e..1b5dd4b76 100644 --- a/package/mnemoc/runit/djb-config +++ b/package/mnemoc/runit/djb-config @@ -19,19 +19,47 @@ # file for details. # # --- ROCK-COPYRIGHT-NOTE-END --- +# e.g. $1: admin mail net ... +# $2: $sbindir $bindir +# +pkg_djb_hierarchy=$1 +pkg_djb_altdir=${2:-$bindir} + +if [ -z "$pkg_djb_hierarchy" ]; then + abort "djb-config: must specify hierarchy /package/\$hierarchy." +fi + +sysconfdir="$sysconfdir/$pkg" +srcdir="$pkg_djb_hierarchy/$pkg-$ver" + +if [ "$createdocs" != "0" -a "$ROCKCFG_CREATE_DOCS" == "1" ]; then + createdocs=0 + hook_add postdoc 2 'pkg_djb_installdoc $pkg_djb_hierarchy' +fi -# why to use this secure stuff? +# custmain +# +custmain="pkg_djb_main" +pkg_djb_main() { + hook_eval premake + ./package/compile + hook_eval inmake + pkg_djb_installpackage $pkg_djb_hierarchy $pkg_djb_altdir + hook_eval postmake +} + +# why to use this safe stuff? # because we can be updating... sure? # to honor daemontools behavior :-) # -pkg_djb_securecopy() { +pkg_djb_safecopy() { echo "'${1#root}/$3' -> '${2#root}/$3'" rm -f $2/$3'{new}' cp -p $1/$3 $2/$3'{new}' mv -f $2/$3'{new}' $2/$3 } -pkg_djb_securelink() { +pkg_djb_safelink() { echo "create symbolic link '${1#root}/$3' to '${2#root}/$3'" rm -f $2/$3'{new}' ln -s $1/$3 $2/$3'{new}' @@ -44,82 +72,84 @@ pkg_djb_installpackage() { # requires ./package/commands # and files in ./command + local x y local package=$1 local altdir=$2 - if [ "$ROCKCFG_PKG_DJB_LAYOUT" == "1" ]; then + if [ "$pkg_djb_packagedir" ]; then echo 'Copying commands to package directory...' mkdir -p $pkg_djb_packagedir/$package/$pkg-$ver/command - for i in `cat ./package/commands`; do - pkg_djb_securecopy ./command \ - $pkg_djb_packagedir/$package/$pkg-$ver/command $i + for x in `cat ./package/commands`; do + pkg_djb_safecopy ./command \ + $pkg_djb_packagedir/$package/$pkg-$ver/command $x done echo "Creating symlink $pkg -> $pkg-$ver..." rm -f $pkg_djb_packagedir/$package/$pkg ln -sv $pkg-$ver $pkg_djb_packagedir/$package/$pkg + fi + if [ "$pkg_djb_commanddir" ]; then echo "Making command links in $pkg_djb_commanddir..." - mkdir -p $pkg_djb_commanddir - for i in `cat package/commands`; do - pkg_djb_securelink $pkg_djb_packagedir/$package/$pkg-$ver/command \ - $pkg_djb_commanddir $i - done - - # usr/local is evil :) - #if [ $ROCKCFG_PKG_DJB_COMPAT -eq 1 ]; then - # echo "Making compatibility links in $pkg_djb_compatdir..." - # mkdir -p $pkg_djb_compatdir - # for i in `cat package/commands`; do - # pkg_djb_securelink $pkg_djb_packagedir/$package/$pkg-$ver/command \ - # $pkg_djb_compatdir $i - # done - #fi + y=pkg_djb_safelink else - echo 'Copying commands to package directory...' + echo 'Copying commands to $altdir...' pkg_djb_commanddir=$altdir - mkdir -p $pkg_djb_commanddir - for i in `cat ./package/commands`; do - pkg_djb_securecopy ./command $pkg_djb_commanddir $i - done + y=pkg_djb_safecopy fi + mkdir -p $pkg_djb_commanddir + for x in `cat package/commands`; do + $y $pkg_djb_packagedir/$package/$pkg-$ver/command \ + $pkg_djb_commanddir $x + done + + # usr/local is evil :) + #if [ "$pkg_djb_compatdir" ]; then + # echo "Making compatibility links in $pkg_djb_compatdir..." + # mkdir -p $pkg_djb_compatdir + # for i in `cat package/commands`; do + # pkg_djb_safelink $pkg_djb_packagedir/$package/$pkg-$ver/command \ + # $pkg_djb_compatdir $i + # done + #fi } -# installs package files into package directory or $docdir as requested +# installs documentation to package directory or $docdir as requested # pkg_djb_installdoc() { - local package=$1 + local x package=$1 + local docpkg - if [ "$ROCKCFG_PKG_DJB_LAYOUT" == "1" ]; then - echo 'Copying package files to package directory...' - mkdir -p $pkg_djb_packagedir/$package/$pkg-$ver/package - for i in `ls ./package`; do - case $i in - compile|install*|upgrade) - /bin/true ;; - *) pkg_djb_securecopy ./package \ - $pkg_djb_packagedir/$package/$pkg-$ver/package $i ;; - esac - done + echo 'Copying documentation....' + if [ "$pkg_djb_packagedir" ]; then + docpkg=$pkg_djb_packagedir/$package/$pkg-$ver/package + docdir=$pkg_djb_packagedir/$package/$pkg-$ver/doc else - echo 'Copying package files to doc directory...' - mkdir -p $docdir - for i in `ls ./package`; do - case $i in - compile|install*|upgrade) - /bin/true ;; - *) pkg_djb_securecopy ./package $docdir $i ;; - esac + docpkg=$docdir + fi + mkdir -p $docpkg $docdir + + # ./package + for x in `ls ./package`; do + case $x in + compile|install*|upgrade) + /bin/true ;; + *) pkg_djb_safecopy ./package $docpkg $x ;; + esac + done + + # ./doc + if [ -d doc ]; then + cp -rLv ./doc/* $docdir + fi + + # ./man + if [ -d man ]; then + echo "Installing man pages ... " + for x in $( cd man; ls -1 *.[1-9] | sed -e 's,.*\.\([1-9]\),\1,g' | sort -u ); do + gzip -9 ./man/*.$x + cp -vf ./man/*.$x.gz $mandir/man$x/ done fi } -pkg_djb_packagedir="$root/package" -pkg_djb_commanddir="$root/command" -#pkg_djb_compatdir="$root/usr/local/bin" - -if [ "$ROCKCFG_PKG_DJB_LAYOUT" == "1" ]; then - pkg_djb_servicedir="$root/service" -else - pkg_djb_servicedir="$root/var/service" -fi diff --git a/package/mnemoc/runit/packages/dhcp-dhcpd_env_LOGDIR.txt b/package/mnemoc/runit/packages/dhcp-dhcpd_env_LOGDIR.txt new file mode 100644 index 000000000..8099f5f3b --- /dev/null +++ b/package/mnemoc/runit/packages/dhcp-dhcpd_env_LOGDIR.txt @@ -0,0 +1 @@ +D_logdir diff --git a/package/mnemoc/runit/packages/dhcp-dhcpd_log_run.txt b/package/mnemoc/runit/packages/dhcp-dhcpd_log_run.txt index de54117a9..96e04500b 100644 --- a/package/mnemoc/runit/packages/dhcp-dhcpd_log_run.txt +++ b/package/mnemoc/runit/packages/dhcp-dhcpd_log_run.txt @@ -1,5 +1,5 @@ #!/bin/sh exec 2>&1 -mkdir -p main -exec svlogd -t main +LOGDIR=$( cat env/LOGDIR ) +exec svlogd -ulog -t $LOGDIR/main diff --git a/package/mnemoc/runit/packages/openssh-env_LOGDIR.txt b/package/mnemoc/runit/packages/openssh-env_LOGDIR.txt new file mode 100644 index 000000000..8099f5f3b --- /dev/null +++ b/package/mnemoc/runit/packages/openssh-env_LOGDIR.txt @@ -0,0 +1 @@ +D_logdir diff --git a/package/mnemoc/runit/packages/openssh-log_run.txt b/package/mnemoc/runit/packages/openssh-log_run.txt index de54117a9..96e04500b 100644 --- a/package/mnemoc/runit/packages/openssh-log_run.txt +++ b/package/mnemoc/runit/packages/openssh-log_run.txt @@ -1,5 +1,5 @@ #!/bin/sh exec 2>&1 -mkdir -p main -exec svlogd -t main +LOGDIR=$( cat env/LOGDIR ) +exec svlogd -ulog -t $LOGDIR/main diff --git a/package/mnemoc/runit/packages/postgresql-env_LOGDIR.txt b/package/mnemoc/runit/packages/postgresql-env_LOGDIR.txt new file mode 100644 index 000000000..8099f5f3b --- /dev/null +++ b/package/mnemoc/runit/packages/postgresql-env_LOGDIR.txt @@ -0,0 +1 @@ +D_logdir diff --git a/package/mnemoc/runit/packages/postgresql-log_run.txt b/package/mnemoc/runit/packages/postgresql-log_run.txt index de54117a9..96e04500b 100644 --- a/package/mnemoc/runit/packages/postgresql-log_run.txt +++ b/package/mnemoc/runit/packages/postgresql-log_run.txt @@ -1,5 +1,5 @@ #!/bin/sh exec 2>&1 -mkdir -p main -exec svlogd -t main +LOGDIR=$( cat env/LOGDIR ) +exec svlogd -ulog -t $LOGDIR/main diff --git a/package/mnemoc/runit/packages/samba-nmbd_env_LOGDIR.txt b/package/mnemoc/runit/packages/samba-nmbd_env_LOGDIR.txt new file mode 100644 index 000000000..8099f5f3b --- /dev/null +++ b/package/mnemoc/runit/packages/samba-nmbd_env_LOGDIR.txt @@ -0,0 +1 @@ +D_logdir diff --git a/package/mnemoc/runit/packages/samba-nmbd_log_run.txt b/package/mnemoc/runit/packages/samba-nmbd_log_run.txt index de54117a9..96e04500b 100644 --- a/package/mnemoc/runit/packages/samba-nmbd_log_run.txt +++ b/package/mnemoc/runit/packages/samba-nmbd_log_run.txt @@ -1,5 +1,5 @@ #!/bin/sh exec 2>&1 -mkdir -p main -exec svlogd -t main +LOGDIR=$( cat env/LOGDIR ) +exec svlogd -ulog -t $LOGDIR/main diff --git a/package/mnemoc/runit/packages/samba-smbd_env_LOGDIR.txt b/package/mnemoc/runit/packages/samba-smbd_env_LOGDIR.txt new file mode 100644 index 000000000..8099f5f3b --- /dev/null +++ b/package/mnemoc/runit/packages/samba-smbd_env_LOGDIR.txt @@ -0,0 +1 @@ +D_logdir diff --git a/package/mnemoc/runit/packages/samba-smbd_log_run.txt b/package/mnemoc/runit/packages/samba-smbd_log_run.txt index de54117a9..96e04500b 100644 --- a/package/mnemoc/runit/packages/samba-smbd_log_run.txt +++ b/package/mnemoc/runit/packages/samba-smbd_log_run.txt @@ -1,5 +1,5 @@ #!/bin/sh exec 2>&1 -mkdir -p main -exec svlogd -t main +LOGDIR=$( cat env/LOGDIR ) +exec svlogd -ulog -t $LOGDIR/main diff --git a/package/mnemoc/runit/parse-config b/package/mnemoc/runit/parse-config index 992d24c3f..510bef3c8 100644 --- a/package/mnemoc/runit/parse-config +++ b/package/mnemoc/runit/parse-config @@ -23,29 +23,58 @@ # # prepare root links for DJB filesystem hierarchy inside chrooted env. # - if [ "$ROCKCFG_PKG_DJB_LAYOUT" == "1" ]; then - for x in package service command; do - mkdir -p $xroot/$x + for x in package command service; do + eval "pkg_djb_${x}dir='$x'" var_append flistroot ' ' $x done - if [ "$pkg" == "runit" ]; then - hook_add premake 1 'for x in package service command; do \ - add_flist $xroot/$x/; \ - done ; \ - chmod 1755 $xroot/package' - fi + #pkg_djb_compatdir="usr/local/bin" elif [ "$ROCKCFG_PKG_DJB_LAYOUT" == "0" ]; then - mkdir -p $xroot/var/service - if [ "$pkg" == "runit" ]; then - hook_add premake 1 'add_flist $xroot/var/service' - fi + pkg_djb_packagedir="" + pkg_djb_commanddir="" + pkg_djb_servicedir="var/service" + #pkg_djb_compatdir="" +fi + +# package +if [ "$pkg_djb_packagedir" ]; then + mkdir -p $xroot/$pkg_djb_packagedir + chmod 1755 $xroot/$pkg_djb_packagedir + pkg_djb_packagedir=$root/$pkg_djb_packagedir +fi + +# service +if [ "$pkg_djb_servicedir" ]; then + mkdir -p $xroot/$pkg_djb_servicedir + chmod 1755 $xroot/$pkg_djb_servicedir + pkg_djb_servicedir=$root/$pkg_djb_servicedir +fi + +# command +if [ "$pkg_djb_commanddir" ]; then + mkdir -p $xroot/$pkg_djb_commanddir + pkg_djb_commanddir=$root/$pkg_djb_commanddir fi # # add init scripts # if pkgcheck runit X; then + # runit_substitute + # + runit_substitute() { + local logdir + + if [ "${localstatedir%$pkg}" != "$localstatedir" ]; then + logdir=$localstatedir/log + else + logdir=$localstatedir/log/$pkg + fi + + sed -e "s,D_logdir,$logdir,g" $1 > $1.new + mv $1.new $1 + } + runitconfdir=$base/package/mnemoc/runit for x in $( cd $runitconfdir/packages; ls -1 $pkg-*.txt 2> /dev/null ); do y=${x#$pkg-}; y=${y%.txt}; y=${y//_/\/} @@ -55,9 +84,27 @@ if pkgcheck runit X; then y=\$sysconfdir/$y fi echo_status "runit: Setting conf to install $y" + case "${y##*/}" in + run|finish) runitxmode=1 ;; + *) runitxmode= ;; + esac hook_add postmake 8 "mkdir -p ${y%/*}; \ + ${runitxmode:+chmod 755 ${y%/*};} \ rock_substitute $runitconfdir/packages/$x > $y; \ - chmod 744 $y;" + runit_substitute $y; \ + ${runitxmode:+chmod 755 $y;}" done - unset runitconfdir + unset runitconfdir runitxmode + + # minimal services + case "$pkg" in + cron) + hook_add postmake 9 'ln -svf /etc/runit/cron $pkg_djb_servicedir/cron' + ;; + sysklogd) + hook_add postmake 9 'ln -svf /etc/runit/syslogd $pkg_djb_servicedir/syslogd' + hook_add postmake 9 'ln -svf /etc/runit/klogd $pkg_djb_servicedir/klogd' + ;; + esac fi + diff --git a/package/mnemoc/runit/postsysfiles.in b/package/mnemoc/runit/postsysfiles.in new file mode 100644 index 000000000..1448c3cd8 --- /dev/null +++ b/package/mnemoc/runit/postsysfiles.in @@ -0,0 +1,2 @@ +safe_groupadd log 9 +safe_useradd log 9 9 "system logs" /var/log /bin/false "*" diff --git a/package/mnemoc/runit/runit.cache b/package/mnemoc/runit/runit.cache index 61b4729b5..6556aa3d7 100644 --- a/package/mnemoc/runit/runit.cache +++ b/package/mnemoc/runit/runit.cache @@ -20,15 +20,15 @@ [COPY] [COPY] --- ROCK-COPYRIGHT-NOTE-END --- -[TIMESTAMP] 1076518203 Wed Feb 11 13:50:03 2004 +[TIMESTAMP] 1077236965 Thu Feb 19 21:29:25 2004 [CONFIG-ID] 2.0.0-rc5-x86-pentium4-32-mnemosyne-expert [ROCKVER] 2.0.0-rc5 [LOGS] 1-runit.log 5-runit.log 9-runit.log -[BUILDTIME] 1786 (9) -[SIZE] 1.85 MB, 114 files +[BUILDTIME] 1825 (9) +[SIZE] 1.86 MB, 130 files -[DEP] 00-dirtree bash binutils bzip2 ccache coreutils findutils gcc33 -[DEP] glibc23 grep gzip linux24-header make patch sed sysfiles tar +[DEP] 00-dirtree bash binutils bzip2 ccache coreutils gcc33 glibc23 grep +[DEP] gzip linux24-header make patch sed sysfiles tar diff --git a/package/mnemoc/runit/runit.conf b/package/mnemoc/runit/runit.conf index 54ac1cf86..9e154bae6 100644 --- a/package/mnemoc/runit/runit.conf +++ b/package/mnemoc/runit/runit.conf @@ -22,17 +22,19 @@ [ "$prefix" = usr ] && sbindir="$root/sbin" -. $base/package/mnemoc/runit/djb-config +. $base/package/mnemoc/runit/djb-config admin $sbindir + +hook_add postmake 6 'pkg_runit_addservices' +if ! pkgcheck daemontools X; then +hook_add postmake 7 ' \ + [ "$pkg_djb_commanddir" ] && add_flist $pkg_djb_commanddir; \ + [ "$pkg_djb_servicedir" ] && add_flist $pkg_djb_servicedir; \ + [ "$pkg_djb_packagedir" ] && add_flist $pkg_djb_packagedir; ' +fi -pkg_runit_main() { +pkg_runit_addservices() { local agettyargs speed - hook_eval premake - ./package/compile - hook_eval inmake - pkg_djb_installpackage admin $sbindir - hook_eval postmake - # main scripts and virtual consoles #if [ ! -f $sysconfdir/1 ]; then echo "Creating main scripts and virtual consoles..." @@ -60,10 +62,13 @@ pkg_runit_main() { fi cat << EOT > $sysconfdir/getty-${i#vc/}/run #!/bin/sh -${pkg_djb_commanddir#$root}/utmpset -w $i exec /sbin/agetty $agettyargs $speed $i linux EOT - chmod 744 $sysconfdir/getty-${i#vc/}/run + cat << EOT > $sysconfdir/getty-${i#vc/}/finish +#!/bin/sh +exec ${pkg_djb_commanddir#$root}/utmpset -w $i +EOT + chmod 755 $sysconfdir/getty-${i#vc/}/{run,finish} done #fi @@ -73,22 +78,14 @@ EOT ln -sfv ${sysconfdir#$root}/getty-$i $pkg_djb_servicedir/ done - # and minimal services - if pkgcheck sysklogd X; then - echo "Make sysklogd available to svscan..." - ln -sfv ${sysconfdir#$root}/syslogd $pkg_djb_servicedir/ - ln -sfv ${sysconfdir#$root}/klogd $pkg_djb_servicedir/ - fi - if pkgcheck cron X; then - echo "Make cron available to svscan..." - ln -sfv ${sysconfdir#$root}/cron $pkg_djb_servicedir/ - fi - + # init at /sbin if [ ${pkg_djb_commanddir} != $sbindir ]; then echo "Copying init files to /sbin..." cp -vf ${pkg_djb_commanddir}/runit* $sbindir/ fi + # TODO: if not sysvinit, link runit-init to init. + # Emulate daemontools if not present if ! pckgcheck daemontools X; then echo "Emulate functionality of daemontools with chpst." @@ -99,19 +96,6 @@ EOT fi } -pkg_runit_doc() { - if [ $createdocs -eq 1 ]; then - #rm -fv $docdir/debian $docdir/*.bak - - pkg_djb_installdoc admin - - gzip -9 ./man/*.8 - echo "Installing man pages ... " - cp -vf ./man/*.8.gz $mandir/man8/ - #cp -vf ./man/*.8 $mandir/man8/ - fi - } - if [ "$ROCKCFG_PKG_DJB_LAYOUT" == "1" ]; then hook_add premake 5 "for x in ./doc/debian/*; do \ if [ -f \$x ]; then \ @@ -128,11 +112,4 @@ else done" fi -sysconfdir="$sysconfdir/runit" -srcdir="admin/$pkg-$ver" - -custmain="pkg_runit_main" -postdoc="pkg_runit_doc" - -createdocs=1 diff --git a/package/mnemoc/socklog/socklog.cache b/package/mnemoc/socklog/socklog.cache new file mode 100644 index 000000000..21ddf9e71 --- /dev/null +++ b/package/mnemoc/socklog/socklog.cache @@ -0,0 +1,34 @@ +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/mnemoc-devel/socklog/socklog.cache +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[TIMESTAMP] 1077240681 Thu Feb 19 22:31:21 2004 +[CONFIG-ID] 2.0.0-rc5-x86-pentium4-32-mnemosyne-expert +[ROCKVER] 2.0.0-rc5 + +[LOGS] 5-socklog.log 9-socklog.log + +[BUILDTIME] 1425 (9) +[SIZE] 0.19 MB, 43 files + +[DEP] 00-dirtree bash binutils bzip2 ccache coreutils gcc33 glibc23 grep +[DEP] gzip linux24-header make runit sed sysfiles tar + diff --git a/package/mnemoc/socklog/socklog.conf b/package/mnemoc/socklog/socklog.conf new file mode 100644 index 000000000..b461d2deb --- /dev/null +++ b/package/mnemoc/socklog/socklog.conf @@ -0,0 +1,25 @@ + +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/mnemoc-devel/socklog/socklog.conf +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +. $base/package/mnemoc/runit/djb-config admin $sbindir + diff --git a/package/mnemoc/socklog/socklog.desc b/package/mnemoc/socklog/socklog.desc new file mode 100644 index 000000000..3f5d38809 --- /dev/null +++ b/package/mnemoc/socklog/socklog.desc @@ -0,0 +1,57 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/mnemoc-devel/socklog/socklog.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] system and kernel logging services + +[T] socklog, in cooperation with the runit package, is a small and secure +[T] replacement for syslogd. There are three main features syslogd provides: +[T] - receiving syslog messages from an unix domain socket ("/dev/log") and +[T] writing them to various files on disk depending on facility and priority. +[T] - receiving syslog messages from an udp socket ("0.0.0.0:514") and writing +[T] them to various files on disk depending on facility and priority. +[T] - writing received syslog messages to an udp socket ("a.b.c.d:514") +[T] +[T] socklog provides the first two features with the help of runit's runsvdir, +[T] runsv, and svlogd, provides a different network logging concept, and +[T] additionally does log event notification. +[T] +[T] svlogd has a built in log file rotation based on file size, so there is no +[T] need for any cron jobs or similar to rotate the logs. Log partitions can be +[T] calculated properly. + +[U] http://smarden.org/socklog/ + +[A] Gerrit Pape +[M] Alejandro Mery + +[C] base/system + +[L] GPL +[S] Stable +[V] 1.3.1 +[P] O -----5---9 800.000 + +[CV-URL] http://smarden.org/socklog/install.html + +[D] 2834955203 socklog-1.3.1.tar.gz http://smarden.org/socklog/ + diff --git a/package/mnemoc/tla/tla.conf b/package/mnemoc/tla/tla.conf new file mode 100644 index 000000000..f88152929 --- /dev/null +++ b/package/mnemoc/tla/tla.conf @@ -0,0 +1,28 @@ + +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/mnemoc-devel/arch/arch.conf +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +hook_add preconf 2 'mkdir =build; cd =build' +hook_add inmake 2 '$MAKE test' + +confopt="--prefix=/\$prefix" +configscript='../src/configure' diff --git a/package/mnemoc/tla/tla.desc b/package/mnemoc/tla/tla.desc new file mode 100644 index 000000000..8610bb72c --- /dev/null +++ b/package/mnemoc/tla/tla.desc @@ -0,0 +1,45 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/mnemoc-devel/arch/arch.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] A modern replacemnt for CVS + +[T] arch is a modern replacement for CVS, specifically designed for the +[T] distributed development needs of free software projects. It has uniquely +[T] good support for development on branches (especially good merging tools), +[T] distributed repositories (every developer can have branches in their own +[T] repository), changeset-oriented project management (arch commits changes +[T] to multiple files at once), and, of course, file and directory renaming. + +[U] http://arch.quackerhead.com/~lord/ + +[A] Tom Lord +[M] Alejandro Mery + +[C] extra/development + +[L] GPL +[S] Stable +[V] 1.2 +[P] X -----5---9 800.000 + +[D] 563114619 tla-1.2.tar.gz http://arch.quackerhead.com/~lord/releases/tla/ diff --git a/package/mnemoc/vserver/vserver.cache b/package/mnemoc/vserver/vserver.cache index d3371a58f..efd072608 100644 --- a/package/mnemoc/vserver/vserver.cache +++ b/package/mnemoc/vserver/vserver.cache @@ -20,14 +20,14 @@ [COPY] [COPY] --- ROCK-COPYRIGHT-NOTE-END --- -[TIMESTAMP] 1076952547 Mon Feb 16 14:29:07 2004 +[TIMESTAMP] 1077240193 Thu Feb 19 22:23:13 2004 [CONFIG-ID] 2.0.0-rc5-x86-pentium4-32-mnemosyne-expert [ROCKVER] 2.0.0-rc5 [LOGS] 5-vserver.log 9-vserver.log -[BUILDTIME] 2455 (9) -[SIZE] 0.59 MB, 104 files +[BUILDTIME] 2499 (9) +[SIZE] 0.59 MB, 107 files [DEP] 00-dirtree bash binutils bzip2 ccache coreutils diffutils e2fsprogs [DEP] findutils gcc33 glibc23 grep linux24-header linux24-src make mktemp