Index: misc/pkgsel/crystal.in =================================================================== --- misc/pkgsel/crystal.in (revision 0) +++ misc/pkgsel/crystal.in (revision 0) @@ -0,0 +1,273 @@ +# --- 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/misc/pkgsel/build-bootstrap.in +# ROCK Linux is Copyright (C) 1998 - 2004 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 https://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- +# +# TITLE: package selection emulating crystal + +pkgfilter sed ' + +# select packages explicitly +/ 00-dirtree / { s/^[XO] /X /p; d; }; +/ acl / { s/^[XO] /X /p; d; }; +/ alsa / { s/^[XO] /X /p; d; }; +/ alsa-driver / { s/^[XO] /X /p; d; }; +/ apache / { s/^[XO] /X /p; d; }; +/ apmd / { s/^[XO] /X /p; d; }; +/ arts / { s/^[XO] /X /p; d; }; +/ at / { s/^[XO] /X /p; d; }; +/ atk / { s/^[XO] /X /p; d; }; +/ attr / { s/^[XO] /X /p; d; }; +/ autoconf / { s/^[XO] /X /p; d; }; +/ automake / { s/^[XO] /X /p; d; }; +/ bash / { s/^[XO] /X /p; d; }; +/ bc / { s/^[XO] /X /p; d; }; +/ bdb41 / { s/^[XO] /X /p; d; }; +/ bin86 / { s/^[XO] /X /p; d; }; +/ binutils / { s/^[XO] /X /p; d; }; +/ bison / { s/^[XO] /X /p; d; }; +/ boehm-gc / { s/^[XO] /X /p; d; }; +/ bzip2 / { s/^[XO] /X /p; d; }; +/ cdrtools / { s/^[XO] /X /p; d; }; +/ coreutils / { s/^[XO] /X /p; d; }; +/ cpuid / { s/^[XO] /X /p; d; }; +/ cracklib / { s/^[XO] /X /p; d; }; +/ cron / { s/^[XO] /X /p; d; }; +/ cups / { s/^[XO] /X /p; d; }; +/ curl / { s/^[XO] /X /p; d; }; +/ cvs / { s/^[XO] /X /p; d; }; +/ devfsd / { s/^[XO] /X /p; d; }; +/ device-mapper / { s/^[XO] /X /p; d; }; +/ dhcp / { s/^[XO] /X /p; d; }; +/ dialog / { s/^[XO] /X /p; d; }; +/ diffutils / { s/^[XO] /X /p; d; }; +/ disktype / { s/^[XO] /X /p; d; }; +/ dump / { s/^[XO] /X /p; d; }; +/ e2fsprogs / { s/^[XO] /X /p; d; }; +/ ed / { s/^[XO] /X /p; d; }; +/ eject / { s/^[XO] /X /p; d; }; +/ expat / { s/^[XO] /X /p; d; }; +/ file / { s/^[XO] /X /p; d; }; +/ findutils / { s/^[XO] /X /p; d; }; +/ flex / { s/^[XO] /X /p; d; }; +/ freetype / { s/^[XO] /X /p; d; }; +/ gawk / { s/^[XO] /X /p; d; }; +/ gcc3 / { s/^[XO] /X /p; d; }; +/ gdb / { s/^[XO] /X /p; d; }; +/ gdbm / { s/^[XO] /X /p; d; }; +/ genromfs / { s/^[XO] /X /p; d; }; +/ gettext / { s/^[XO] /X /p; d; }; +/ gimp / { s/^[XO] /X /p; d; }; +/ gimp-print42 / { s/^[XO] /X /p; d; }; +/ glib / { s/^[XO] /X /p; d; }; +/ glib12 / { s/^[XO] /X /p; d; }; +/ glibc23 / { s/^[XO] /X /p; d; }; +/ gpm / { s/^[XO] /X /p; d; }; +/ grep / { s/^[XO] /X /p; d; }; +/ groff / { s/^[XO] /X /p; d; }; +/ grub / { s/^[XO] /X /p; d; }; +/ gtk+ / { s/^[XO] /X /p; d; }; +/ gzip / { s/^[XO] /X /p; d; }; +/ hdparm / { s/^[XO] /X /p; d; }; +/ hpijs / { s/^[XO] /X /p; d; }; +/ ifhp / { s/^[XO] /X /p; d; }; +/ ifplugd / { s/^[XO] /X /p; d; }; +/ indent / { s/^[XO] /X /p; d; }; +/ iproute2 / { s/^[XO] /X /p; d; }; +/ iptables / { s/^[XO] /X /p; d; }; +/ irda-utils / { s/^[XO] /X /p; d; }; +/ isdn4k-utils / { s/^[XO] /X /p; d; }; +/ jfsutils / { s/^[XO] /X /p; d; }; +/ k3b / { s/^[XO] /X /p; d; }; +/ kbd / { s/^[XO] /X /p; d; }; +/ kde-i18n-de / { s/^[XO] /X /p; d; }; +/ kde-i18n-es / { s/^[XO] /X /p; d; }; +/ kde-i18n-fr / { s/^[XO] /X /p; d; }; +/ kde-i18n-it / { s/^[XO] /X /p; d; }; +/ kdeaccessibility / { s/^[XO] /X /p; d; }; +/ kdeaddons / { s/^[XO] /X /p; d; }; +/ kdeadmin / { s/^[XO] /X /p; d; }; +/ kdeartwork / { s/^[XO] /X /p; d; }; +/ kdebase / { s/^[XO] /X /p; d; }; +/ kdebindings / { s/^[XO] /X /p; d; }; +/ kdeedu / { s/^[XO] /X /p; d; }; +/ kdegames / { s/^[XO] /X /p; d; }; +/ kdegraphics / { s/^[XO] /X /p; d; }; +/ kdelibs / { s/^[XO] /X /p; d; }; +/ kdemultimedia / { s/^[XO] /X /p; d; }; +/ kdenetwork / { s/^[XO] /X /p; d; }; +/ kdepim / { s/^[XO] /X /p; d; }; +/ kdesdk / { s/^[XO] /X /p; d; }; +/ kdetoys / { s/^[XO] /X /p; d; }; +/ kdeutils / { s/^[XO] /X /p; d; }; +/ kdevelop / { s/^[XO] /X /p; d; }; +/ kdirstat / { s/^[XO] /X /p; d; }; +/ kiss / { s/^[XO] /X /p; d; }; +/ koffice / { s/^[XO] /X /p; d; }; +/ koffice-i18n / { s/^[XO] /X /p; d; }; +/ ksymoops / { s/^[XO] /X /p; d; }; +/ lcap / { s/^[XO] /X /p; d; }; +/ less / { s/^[XO] /X /p; d; }; +/ libart_lgpl23 / { s/^[XO] /X /p; d; }; +/ libcap / { s/^[XO] /X /p; d; }; +/ libdaemon / { s/^[XO] /X /p; d; }; +/ libglade / { s/^[XO] /X /p; d; }; +/ libidl / { s/^[XO] /X /p; d; }; +/ libjpeg / { s/^[XO] /X /p; d; }; +/ liblockfile / { s/^[XO] /X /p; d; }; +/ libmng / { s/^[XO] /X /p; d; }; +/ libpcap / { s/^[XO] /X /p; d; }; +/ libpng / { s/^[XO] /X /p; d; }; +/ libsdl / { s/^[XO] /X /p; d; }; +/ libsdl_console / { s/^[XO] /X /p; d; }; +/ libsdl_gfx / { s/^[XO] /X /p; d; }; +/ libsdl_image / { s/^[XO] /X /p; d; }; +/ libsdl_mixer / { s/^[XO] /X /p; d; }; +/ libsdl_net / { s/^[XO] /X /p; d; }; +/ libsdl_perl / { s/^[XO] /X /p; d; }; +/ libsdl_ttf / { s/^[XO] /X /p; d; }; +/ libsdlmm / { s/^[XO] /X /p; d; }; +/ libtiff / { s/^[XO] /X /p; d; }; +/ libtool / { s/^[XO] /X /p; d; }; +/ libxml / { s/^[XO] /X /p; d; }; +/ libxml2 / { s/^[XO] /X /p; d; }; +/ libxslt / { s/^[XO] /X /p; d; }; +/ linux24 / { s/^[XO] /X /p; d; }; +/ linux24-header / { s/^[XO] /X /p; d; }; +/ linux24-src / { s/^[XO] /X /p; d; }; +/ lshw / { s/^[XO] /X /p; d; }; +/ lsof / { s/^[XO] /X /p; d; }; +/ ltrace / { s/^[XO] /X /p; d; }; +/ lvm2 / { s/^[XO] /X /p; d; }; +/ lynx / { s/^[XO] /X /p; d; }; +/ m4 / { s/^[XO] /X /p; d; }; +/ mailx / { s/^[XO] /X /p; d; }; +/ make / { s/^[XO] /X /p; d; }; +/ man / { s/^[XO] /X /p; d; }; +/ man-pages / { s/^[XO] /X /p; d; }; +/ mdadm / { s/^[XO] /X /p; d; }; +/ memtest86 / { s/^[XO] /X /p; d; }; +/ microcode_ctl / { s/^[XO] /X /p; d; }; +/ mine / { s/^[XO] /X /p; d; }; +/ miscfiles / { s/^[XO] /X /p; d; }; +/ mktemp / { s/^[XO] /X /p; d; }; +/ mmv / { s/^[XO] /X /p; d; }; +/ module-init-tools / { s/^[XO] /X /p; d; }; +/ modutils / { s/^[XO] /X /p; d; }; +/ mozilla / { s/^[XO] /X /p; d; }; +/ mutt / { s/^[XO] /X /p; d; }; +/ mysql / { s/^[XO] /X /p; d; }; +/ ncftp / { s/^[XO] /X /p; d; }; +/ ncompress / { s/^[XO] /X /p; d; }; +/ ncurses / { s/^[XO] /X /p; d; }; +/ net-snmp / { s/^[XO] /X /p; d; }; +/ net-tools / { s/^[XO] /X /p; d; }; +/ netkit-base / { s/^[XO] /X /p; d; }; +/ netkit-ftp / { s/^[XO] /X /p; d; }; +/ netkit-ntalk / { s/^[XO] /X /p; d; }; +/ netkit-routed / { s/^[XO] /X /p; d; }; +/ netkit-rsh / { s/^[XO] /X /p; d; }; +/ netkit-telnet / { s/^[XO] /X /p; d; }; +/ nfs-utils / { s/^[XO] /X /p; d; }; +/ ntp / { s/^[XO] /X /p; d; }; +/ ogg-vorbis / { s/^[XO] /X /p; d; }; +/ openssh / { s/^[XO] /X /p; d; }; +/ openssl / { s/^[XO] /X /p; d; }; +/ pam / { s/^[XO] /X /p; d; }; +/ pango / { s/^[XO] /X /p; d; }; +/ parted / { s/^[XO] /X /p; d; }; +/ patch / { s/^[XO] /X /p; d; }; +/ patchutils / { s/^[XO] /X /p; d; }; +/ pciutils / { s/^[XO] /X /p; d; }; +/ pcmcia-cs / { s/^[XO] /X /p; d; }; +/ pcre / { s/^[XO] /X /p; d; }; +/ perl5 / { s/^[XO] /X /p; d; }; +/ php / { s/^[XO] /X /p; d; }; +/ pidentd / { s/^[XO] /X /p; d; }; +/ pkgconfig / { s/^[XO] /X /p; d; }; +/ popt / { s/^[XO] /X /p; d; }; +/ portmap / { s/^[XO] /X /p; d; }; +/ postfix / { s/^[XO] /X /p; d; }; +/ postgresql / { s/^[XO] /X /p; d; }; +/ ppp / { s/^[XO] /X /p; d; }; +/ pptp-linux / { s/^[XO] /X /p; d; }; +/ procinfo / { s/^[XO] /X /p; d; }; +/ procmail / { s/^[XO] /X /p; d; }; +/ procps / { s/^[XO] /X /p; d; }; +/ psmisc / { s/^[XO] /X /p; d; }; +/ psutils / { s/^[XO] /X /p; d; }; +/ python / { s/^[XO] /X /p; d; }; +/ qt / { s/^[XO] /X /p; d; }; +/ quanta / { s/^[XO] /X /p; d; }; +/ quota / { s/^[XO] /X /p; d; }; +/ rcs / { s/^[XO] /X /p; d; }; +/ readline / { s/^[XO] /X /p; d; }; +/ reiserfsprogs / { s/^[XO] /X /p; d; }; +/ rock-debug / { s/^[XO] /X /p; d; }; +/ rock-doc / { s/^[XO] /X /p; d; }; +/ rock-src / { s/^[XO] /X /p; d; }; +/ rockplug / { s/^[XO] /X /p; d; }; +/ rsync / { s/^[XO] /X /p; d; }; +/ samba / { s/^[XO] /X /p; d; }; +/ screen / { s/^[XO] /X /p; d; }; +/ sed / { s/^[XO] /X /p; d; }; +/ setserial / { s/^[XO] /X /p; d; }; +/ shadow / { s/^[XO] /X /p; d; }; +/ sharutils / { s/^[XO] /X /p; d; }; +/ slang / { s/^[XO] /X /p; d; }; +/ smartmontools / { s/^[XO] /X /p; d; }; +/ strace / { s/^[XO] /X /p; d; }; +/ subversion / { s/^[XO] /X /p; d; }; +/ sysfiles / { s/^[XO] /X /p; d; }; +/ sysklogd / { s/^[XO] /X /p; d; }; +/ sysstat / { s/^[XO] /X /p; d; }; +/ sysvinit / { s/^[XO] /X /p; d; }; +/ tar / { s/^[XO] /X /p; d; }; +/ tcltk / { s/^[XO] /X /p; d; }; +/ tcp_wrappers / { s/^[XO] /X /p; d; }; +/ tcpdump / { s/^[XO] /X /p; d; }; +/ tcsh / { s/^[XO] /X /p; d; }; +/ termcap / { s/^[XO] /X /p; d; }; +/ termutils / { s/^[XO] /X /p; d; }; +/ texinfo / { s/^[XO] /X /p; d; }; +/ tftp-hpa / { s/^[XO] /X /p; d; }; +/ time / { s/^[XO] /X /p; d; }; +/ tk / { s/^[XO] /X /p; d; }; +/ traceroute / { s/^[XO] /X /p; d; }; +/ tree / { s/^[XO] /X /p; d; }; +/ unzip / { s/^[XO] /X /p; d; }; +/ usbutils / { s/^[XO] /X /p; d; }; +/ util-linux / { s/^[XO] /X /p; d; }; +/ vim / { s/^[XO] /X /p; d; }; +/ w3m / { s/^[XO] /X /p; d; }; +/ wdiff / { s/^[XO] /X /p; d; }; +/ wget / { s/^[XO] /X /p; d; }; +/ whois / { s/^[XO] /X /p; d; }; +/ wireless-tools / { s/^[XO] /X /p; d; }; +/ wu-ftpd / { s/^[XO] /X /p; d; }; +/ x86info / { s/^[XO] /X /p; d; }; +/ xfree86 / { s/^[XO] /X /p; d; }; +/ xfsprogs / { s/^[XO] /X /p; d; }; +/ xscreensaver / { s/^[XO] /X /p; d; }; +/ zip / { s/^[XO] /X /p; d; }; +/ zlib / { s/^[XO] /X /p; d; }; +# Disable the rest +/.*/ { s/^X /O / ; p; d; };' + Index: package/alessandro/php/php.desc =================================================================== --- package/alessandro/php/php.desc (revision 4986) +++ package/alessandro/php/php.desc (working copy) @@ -35,8 +35,8 @@ [L] OpenSource [S] Stable -[V] 4.3.4 +[V] 4.3.9 [P] X -----5---9 703.000 -[D] 2522772204 php-4.3.4.tar.bz2 https://static.php.net/www.php.net/distributions/ +[D] 2335548844 php-4.3.9.tar.bz2 https://static.php.net/www.php.net/distributions/ Index: package/alessandro/php/config.hlp =================================================================== --- package/alessandro/php/config.hlp (revision 4986) +++ package/alessandro/php/config.hlp (working copy) @@ -21,20 +21,30 @@ # --- ROCK-COPYRIGHT-NOTE-END --- MENU_PKG_PHP - Here you will find all options concerning PHP + Here you will find all options concerning PHP. ROCKCFG_PKG_PHP_FORCESHARED Please check here if you want to use shared libraries instead of PHP's built-in support for various applications. ROCKCFG_PKG_PHP_mysql - Please check here if you want to activate MySQL-support + Please check here if you want to activate MySQL support. ROCKCFG_PKG_PHP_postgresql - Please check here if you want to activate PostgreSQL-support + Please check here if you want to activate PostgreSQL support. ROCKCFG_PKG_PHP_openldap - Please check here if you want to activate OpenLDAP-support + Please check here if you want to activate OpenLDAP support. ROCKCFG_PKG_PHP_openssl - Please check here if you want to activate OpenSSL-support + Please check here if you want to activate OpenSSL support. + +ROCKCFG_PKG_PHP_mcrypt + Please check here if you want to activate libmcrypt support. + +ROCKCFG_PKG_PHP_mhash + Please check here if you want to activate libmhash support. + +ROCKCFG_PKG_PHP_gd + Please check here if you want to activate libgd support. + Index: package/alessandro/php/config.in =================================================================== --- package/alessandro/php/config.in (revision 4986) +++ package/alessandro/php/config.in (working copy) @@ -31,6 +31,7 @@ done bool "Build PHP with mcrypt support" ROCKCFG_PKG_PHP_mcrypt 0 + bool "Build PHP with mhash support" ROCKCFG_PKG_PHP_mhash 0 bool "Build PHP with gd support" ROCKCFG_PKG_PHP_gd 0 menu_end Index: package/alessandro/php/php.conf =================================================================== --- package/alessandro/php/php.conf (revision 4986) +++ package/alessandro/php/php.conf (working copy) @@ -25,20 +25,21 @@ if [ "$ROCKCFG_PKG_PHP_mysql" = 1 ] ; then if [ "$ROCKCFG_PKG_PHP_FORCESHARED" -eq 1 ]; then - pkg_php_shared='=shared' - elif pkgcheck mysql X ; then - pkg_php_shared='=shared' + pkg_php_shared="=$root/${pkg_mysql_prefix}" + elif pkginstalled mysql; then + pkg_php_shared="=$root/${pkg_mysql_prefix}" else pkg_php_shared='' fi var_append extraconfopt " " "--with-mysql$pkg_php_shared" fi -[ "$ROCKCFG_PKG_PHP_postgresql" = 1 ] && var_append extraconfopt " " "--with-pgsql=${pkg_postgresql_prefix}" -[ "$ROCKCFG_PKG_PHP_openldap" = 1 ] && var_append extraconfopt " " "--with-ldap=${pkg_openldap_prefix}" +[ "$ROCKCFG_PKG_PHP_postgresql" = 1 ] && var_append extraconfopt " " "--with-pgsql=$root/${pkg_postgresql_prefix}" +[ "$ROCKCFG_PKG_PHP_openldap" = 1 ] && var_append extraconfopt " " "--with-ldap=$root/${pkg_openldap_prefix}" [ "$ROCKCFG_PKG_PHP_openssl" = 1 ] && var_append extraconfopt " " "--with-openssl" [ "$ROCKCFG_PKG_PHP_mcrypt" = 1 ] && var_append extraconfopt " " "--with-mcrypt" +[ "$ROCKCFG_PKG_PHP_mcrypt" = 1 ] && var_append extraconfopt " " "--with-mhash" [ "$ROCKCFG_PKG_PHP_gd" = 1 ] && var_append extraconfopt " " "--with-gd" postmake='cp php.ini-* $docdir' Index: package/praenti/cups/cups.desc =================================================================== --- package/praenti/cups/cups.desc (revision 4986) +++ package/praenti/cups/cups.desc (working copy) @@ -51,8 +51,8 @@ [L] GPL [S] Stable -[V] 1.1.21 +[V] 1.1.22 [P] X -?---5---9 122.900 -[D] 2380237460 cups-1.1.21-source.tar.bz2 ftp://ftp.easysw.com/pub/cups/1.1.21/ +[D] 2633247337 cups-1.1.22-source.tar.bz2 ftp://ftp.easysw.com/pub/cups/1.1.22/ Index: package/michiel/postgresql/postgresql.desc =================================================================== --- package/michiel/postgresql/postgresql.desc (revision 4986) +++ package/michiel/postgresql/postgresql.desc (working copy) @@ -41,8 +41,8 @@ [L] OpenSource [S] Stable -[V] 7.4.1 +[V] 7.4.3 [P] X -----5---9 375.000 -[D] 2866104335 postgresql-7.4.1.tar.bz2 ftp://ftp.postgresql.org/pub/source/v7.4.1/ +[D] 3586885641 postgresql-7.4.3.tar.bz2 ftp://ftp.postgresql.org/pub/source/v7.4.3/ Index: package/michiel/postgresql/postgresql.init =================================================================== --- package/michiel/postgresql/postgresql.init (revision 0) +++ package/michiel/postgresql/postgresql.init (revision 0) @@ -0,0 +1,21 @@ +#!/bin/sh +# +# Desc: The PostgreSQL server +# Runlevel: 30 rcX +# + +main_begin + + block_begin(start, `Starting PostgreSQL Server.') + check(`(su postgres -c "D_prefix/bin/postmaster -i -S")') + block_end + + block_begin(stop, `Stopping PostgreSQL Server.') + check(`killall postmaster') + block_end + + block_begin(restart, `Restarting PostgreSQL Server.') + check(`killall -1 postmaster') + block_end + +main_end Index: package/michiel/postgresql/postgresql.conf =================================================================== --- package/michiel/postgresql/postgresql.conf (revision 4986) +++ package/michiel/postgresql/postgresql.conf (working copy) @@ -28,7 +28,26 @@ var_append extraconfopt " " "--with-CXX" var_append extraconfopt " " "--with-gnu-ld" var_append extraconfopt " " "--with-perl" +var_append extraconfopt " " "--with-openssl" +postgresql_pm() { + # Create the data directory + mkdir -p $root/$localstatedir/data + chown -R postgres:postgres $root/$localstatedir/data + + # Create the Profile + echo "Creating /etc/profile.d/$pkg ..." + cat <<- EOT > $root/etc/profile.d/$pkg + export PGDATA=$localstatedir/data + EOT + + # Install the init + install_init postgresql $confdir/postgresql.init +} + # other packages may need to know where postgres is. hook_add postmake 3 "echo \"pkg_postgresql_prefix=/$prefix\" \ > $root/var/adm/parse-config/postgresql" + +postmake="postgresql_pm" + Index: package/michiel/gaim/gaim-0.81_msn-slp.patch =================================================================== --- package/michiel/gaim/gaim-0.81_msn-slp.patch (revision 4986) +++ package/michiel/gaim/gaim-0.81_msn-slp.patch (working copy) @@ -1,43 +0,0 @@ -# --- 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/michiel/gaim/gaim-0.81_msn-slp.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at https://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -Index: slp.c -=================================================================== -RCS file: /cvsroot/gaim/gaim/src/protocols/msn/slp.c,v -retrieving revision 1.7 -retrieving revision 1.8 -diff -u -d -p -r1.7 -r1.8 ---- gaim-old/src/protocols/msn/slp.c 15 Jun 2004 02:37:25 -0000 1.7 -+++ gaim-new/src/protocols/msn/slp.c 11 Aug 2004 18:05:10 -0000 1.8 -@@ -645,8 +645,12 @@ msn_slp_sip_recv(MsnSlpLink *slplink, co - if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) || - (c = strchr(status, '\0'))) - { -- strncpy(temp, status, c - status); -- temp[c - status] = '\0'; -+ size_t offset = c - status; -+ if (offset >= sizeof(temp)) -+ offset = sizeof(temp) - 1; -+ -+ strncpy(temp, status, offset); -+ temp[offset] = '\0'; - } - - gaim_debug_error("msn", "Received non-OK result: %s\n", temp); - Index: package/michiel/gaim/gaim.desc =================================================================== --- package/michiel/gaim/gaim.desc (revision 4986) +++ package/michiel/gaim/gaim.desc (working copy) @@ -36,9 +36,9 @@ [L] GPL [S] Stable -[V] 0.81 +[V] 1.0.3 [P] X -----5---9 704.000 -[D] 122517827 gaim-0.81.tar.bz2 https://dl.sourceforge.net/sourceforge/gaim/ +[D] 2379762292 gaim-1.0.3.tar.bz2 https://dl.sourceforge.net/sourceforge/gaim/ Index: package/daja77/libassuan/libassuan.desc =================================================================== --- package/daja77/libassuan/libassuan.desc (revision 0) +++ package/daja77/libassuan/libassuan.desc (revision 0) @@ -0,0 +1,39 @@ + +[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/daja77/libassuan/libassuan.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 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 https://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] An IPC library used by the next generation of GnuPG. + +[T] An IPC library used by the next generation of GnuPG +[T] and it's various components. + +[A] Bernhard Reiter {Project Coordinator} +[M] Daniel Jahre + +[C] base/library + +[L] GPL +[S] Alpha +[V] 0.6.7 +[P] X -?---5---9 118.100 + +[D] 1320926415 libassuan-0.6.7.tar.gz ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/ Index: package/mnemoc/runit/djb-config =================================================================== --- package/mnemoc/runit/djb-config (revision 4986) +++ package/mnemoc/runit/djb-config (working copy) @@ -25,11 +25,22 @@ pkg_djb_hierarchy=$1 pkg_djb_altdir=${2:-$bindir} +# $logdir +if [ "${localstatedir%$pkg}" != "$localstatedir" ]; then + logdir=$localstatedir/log +else + logdir=$localstatedir/log/$pkg +fi + +# $sysconfdir +if [ "${sysconfdir%$pkg}" == "$sysconfdir" ]; then + sysconfdir=$root/etc/$pkg +fi + 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 @@ -66,6 +77,14 @@ mv -f $2/$3'{new}' $2/$3 } +pkg_djb_substitute() { + sed -i \ + -e "s,D_commanddir,$pkg_djb_commanddir,g" \ + -e "s,D_servicedir,$pkg_djb_servicedir,g" \ + -e "s,D_logdir,$logdir,g" \ + $1 +} + # installs the package in DJB way if requested # pkg_djb_installpackage() { Index: package/mnemoc/runit/runit.conf =================================================================== --- package/mnemoc/runit/runit.conf (revision 4986) +++ package/mnemoc/runit/runit.conf (working copy) @@ -25,7 +25,7 @@ . $base/package/mnemoc/runit/djb-config admin $sbindir hook_add postmake 6 'pkg_runit_addservices' -if ! pkgcheck daemontools X; then +if ! pkginstalled daemontools; then hook_add postmake 7 ' \ [ "$pkg_djb_commanddir" ] && add_flist $pkg_djb_commanddir; \ [ "$pkg_djb_servicedir" ] && add_flist $pkg_djb_servicedir; \ Index: package/mnemoc/runit/parse-config =================================================================== --- package/mnemoc/runit/parse-config (revision 4986) +++ package/mnemoc/runit/parse-config (working copy) @@ -59,7 +59,7 @@ # # add init scripts # -if pkgcheck runit X; then +if pkginstalled runit; then # runit_substitute # runit_substitute() { @@ -71,11 +71,11 @@ logdir=$localstatedir/log/$pkg fi - sed -e "s,D_logdir,$logdir,g" $1 > $1.new - mv $1.new $1 + sed -i -e "s,D_logdir,$logdir,g" $1 } runitconfdir=$base/package/mnemoc/runit + runit_has_script=0 for x in $( cd $runitconfdir/packages; ls -1 $pkg-*.txt 2> /dev/null ); do y=${x#$pkg-}; y=${y%.txt}; y=${y//_/\/} if [ "${y#runit-}" != "$y" ]; then @@ -84,6 +84,7 @@ y=\$sysconfdir/$y fi echo_status "runit: Setting conf to install $y" + runit_has_script=1 case "${y##*/}" in run|finish) runitxmode=1 ;; *) runitxmode= ;; @@ -94,8 +95,35 @@ runit_substitute $y; \ ${runitxmode:+chmod 755 $y;}" done - unset runitconfdir runitxmode + # fake ROCK' standard install_init if sysvinit will not be built + if ! pkgcheck sysvinit X; then + if [ $runit_has_script -eq 1 ]; then + install_init() { + # i have already installed the script + true + } + else + install_init() { + name=$1 ; file=$2 ; initdir="$root/etc/rc.d" + + echo -n "Install SysV Init script '$name' (xx/xx): " + m4 -Dinitstyle=$ROCKCFG_PKG_SYSVINIT_INITSTYLE \ + -D"D_prefix=/$prefix" -D"D_sysconfdir=$sysconfdir" \ + -D"D_docdir=$docdir" -D"D_localstatedir=$localstatedir" \ + -D"D_datadir=$datadir" -D"D_infodir=$infodir" \ + -D"D_bindir=$bindir" -D"D_sbindir=$sbindir" \ + -D"D_libdir=$libdir" -D"D_mandir=$mandir" \ + $base/package/base/sysvinit/init_macros.m4 \ + $file > $initdir/init.d/$name + chmod +x $initdir/init.d/$name + echo " done." + } + fi + fi + + unset runitconfdir runitxmode runit_has_script + # minimal services case "$pkg" in cron) Index: package/mnemoc/runit/packages/samba-nmbd_env_LOGDIR.txt =================================================================== --- package/mnemoc/runit/packages/samba-nmbd_env_LOGDIR.txt (revision 4986) +++ package/mnemoc/runit/packages/samba-nmbd_env_LOGDIR.txt (working copy) @@ -1 +1 @@ -D_logdir +D_logdir/nmbd Index: package/mnemoc/runit/packages/samba-smbd_env_LOGDIR.txt =================================================================== --- package/mnemoc/runit/packages/samba-smbd_env_LOGDIR.txt (revision 4986) +++ package/mnemoc/runit/packages/samba-smbd_env_LOGDIR.txt (working copy) @@ -1 +1 @@ -D_logdir +D_logdir/smbd Index: package/mnemoc/runit/packages/samba-nmbd_log_run.txt =================================================================== --- package/mnemoc/runit/packages/samba-nmbd_log_run.txt (revision 4986) +++ package/mnemoc/runit/packages/samba-nmbd_log_run.txt (working copy) @@ -1,5 +1,9 @@ #!/bin/sh exec 2>&1 -LOGDIR=$( cat env/LOGDIR ) -exec svlogd -ulog -t $LOGDIR/main +LOGDIR=$( cat ../env/LOGDIR ) +if [ ! -d $LOGDIR ]; then + mkdir -p $LOGDIR + chown log $LOGDIR +fi +exec setuidgid log svlogd -t $LOGDIR Index: package/mnemoc/runit/packages/samba-smbd_log_run.txt =================================================================== --- package/mnemoc/runit/packages/samba-smbd_log_run.txt (revision 4986) +++ package/mnemoc/runit/packages/samba-smbd_log_run.txt (working copy) @@ -1,5 +1,9 @@ #!/bin/sh exec 2>&1 -LOGDIR=$( cat env/LOGDIR ) -exec svlogd -ulog -t $LOGDIR/main +LOGDIR=$( cat ../env/LOGDIR ) +if [ ! -d $LOGDIR ]; then + mkdir -p $LOGDIR + chown log $LOGDIR +fi +exec setuidgid log svlogd -t $LOGDIR Index: package/mnemoc/runit/runit.desc =================================================================== --- package/mnemoc/runit/runit.desc (revision 4986) +++ package/mnemoc/runit/runit.desc (working copy) @@ -40,10 +40,10 @@ [L] OpenSource [S] Stable -[V] 1.0.0 +[V] 1.0.2 [P] O -1---5---9 700.000 [CV-URL] https://smarden.org/runit/install.html -[D] 3475171302 runit-1.0.0.tar.gz https://smarden.org/runit/ +[D] 1975530150 runit-1.0.2.tar.gz https://smarden.org/runit/ Index: package/x86/lilo/lilo.desc =================================================================== --- package/x86/lilo/lilo.desc (revision 4986) +++ package/x86/lilo/lilo.desc (working copy) @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 22.6 +[V] 22.6.1 [P] X -----5---9 805.000 -[D] 3871844352 lilo-22.6.tar.gz https://home.san.rr.com/johninsd/pub/linux/lilo/ +[D] 737300815 lilo-22.6.1.src.tar.gz https://home.san.rr.com/johninsd/pub/linux/lilo/ Index: package/x86/grub/gcc34.patch =================================================================== --- package/x86/grub/gcc34.patch (revision 4986) +++ package/x86/grub/gcc34.patch (working copy) @@ -1,36 +0,0 @@ -# --- 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/x86/grub/gcc34.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at https://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -=================================================================== -RCS file: /cvsroot/grub/cvsroot/grub/grub/stage2/char_io.c,v -retrieving revision 1.51 -retrieving revision 1.52 -diff -u -r1.51 -r1.52 ---- grub/stage2/char_io.c 2002/12/09 06:27:05 1.51 -+++ grub/stage2/char_io.c 2004/03/27 17:02:54 1.52 -@@ -1265,3 +1265,9 @@ - return dest; - } - #endif /* ! STAGE1_5 */ -+ -+#ifndef GRUB_UTIL -+# undef memcpy -+/* GCC emits references to memcpy() for struct copies etc. */ -+void *memcpy (void *dest, const void *src, int n) __attribute__ ((alias ("grub_memmove"))); -+#endif Index: package/x86/grub/grub.desc =================================================================== --- package/x86/grub/grub.desc (revision 4986) +++ package/x86/grub/grub.desc (working copy) @@ -45,8 +45,8 @@ [L] GPL [S] Stable -[V] 0.94 +[V] 0.95 [P] X -----5---9 804.000 -[D] 2577767961 grub-0.94.tar.gz ftp://alpha.gnu.org/gnu/grub/ +[D] 573949549 grub-0.95.tar.gz ftp://alpha.gnu.org/gnu/grub/ Index: package/gnome2/evolution/hotfix.patch =================================================================== --- package/gnome2/evolution/hotfix.patch (revision 4986) +++ package/gnome2/evolution/hotfix.patch (working copy) @@ -40,3 +40,243 @@ #define CAMEL_NNTP_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_nntp_summary_get_type (), CamelNNTPSummary) #define CAMEL_NNTP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_summary_get_type (), CamelNNTPSummaryClass) +--- evolution-1.4.6/e-util/e-component-listener.c~ 2003-06-04 17:05:09.000000000 +0200 ++++ evolution-1.4.6/e-util/e-component-listener.c 2004-07-19 17:05:37.530238768 +0200 +@@ -52,7 +52,6 @@ + cl->priv->component = CORBA_OBJECT_NIL; + g_object_unref (cl); + break; +- default : + } + } + } +--- evolution-1.4.6/addressbook/conduit/address-conduit.c.orig 2004-07-19 21:45:44.116249336 +0200 ++++ evolution-1.4.6/addressbook/conduit/address-conduit.c 2004-07-19 21:46:07.206739048 +0200 +@@ -609,7 +609,6 @@ + return E_CARD_SIMPLE_FIELD_EMAIL_2; + case E_CARD_SIMPLE_FIELD_EMAIL_2: + return E_CARD_SIMPLE_FIELD_EMAIL_3; +- default: + } + + return E_CARD_SIMPLE_FIELD_LAST; +@@ -624,7 +623,6 @@ + switch (*field) { + case E_CARD_SIMPLE_FIELD_PHONE_HOME: + return E_CARD_SIMPLE_FIELD_PHONE_HOME_2; +- default: + } + + return E_CARD_SIMPLE_FIELD_LAST; +@@ -639,7 +637,6 @@ + switch (*field) { + case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS: + return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2; +- default: + } + + return E_CARD_SIMPLE_FIELD_LAST; +@@ -656,7 +653,6 @@ + return E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX; + case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX: + return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX; +- default: + } + + return E_CARD_SIMPLE_FIELD_LAST; +--- evolution-1.4.6/calendar/cal-client/cal-client.c.orig 2004-07-19 22:27:58.601948944 +0200 ++++ evolution-1.4.6/calendar/cal-client/cal-client.c 2004-07-19 22:27:10.202306808 +0200 +@@ -2886,26 +2886,26 @@ + return cal_client_remove_object_with_mod (client, uid, CALOBJ_MOD_ALL); + } + +-CalClientResult ++CalClientSendResult + cal_client_send_object (CalClient *client, icalcomponent *icalcomp, + icalcomponent **new_icalcomp, GList **users, + char error_msg[256]) + { + CalClientPrivate *priv; + CORBA_Environment ev; +- CalClientResult retval; ++ CalClientSendResult retval; + GNOME_Evolution_Calendar_UserList *user_list; + char *obj_string; + int i; + +- g_return_val_if_fail (client != NULL, CAL_CLIENT_RESULT_INVALID_OBJECT); +- g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_RESULT_INVALID_OBJECT); ++ g_return_val_if_fail (client != NULL, CAL_CLIENT_SEND_INVALID_OBJECT); ++ g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_SEND_INVALID_OBJECT); + + priv = client->priv; + g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, +- CAL_CLIENT_RESULT_INVALID_OBJECT); ++ CAL_CLIENT_SEND_INVALID_OBJECT); + +- g_return_val_if_fail (icalcomp != NULL, CAL_CLIENT_RESULT_INVALID_OBJECT); ++ g_return_val_if_fail (icalcomp != NULL, CAL_CLIENT_SEND_INVALID_OBJECT); + + /* Libical owns this memory, using one of its temporary buffers. */ + obj_string = icalcomponent_as_ical_string (icalcomp); +@@ -2925,13 +2925,13 @@ + g_message ("cal_client_update_objects(): could not send the objects"); + retval = CAL_CLIENT_SEND_CORBA_ERROR; + } else { +- retval = CAL_CLIENT_RESULT_SUCCESS; ++ retval = CAL_CLIENT_SEND_SUCCESS; + + *new_icalcomp = icalparser_parse_string (obj_string); + CORBA_free (obj_string); + + if (*new_icalcomp == NULL) { +- retval = CAL_CLIENT_RESULT_INVALID_OBJECT; ++ retval = CAL_CLIENT_SEND_INVALID_OBJECT; + } else { + *users = NULL; + for (i = 0; i < user_list->_length; i++) +--- evolution-1.4.6/calendar/gui/e-day-view.c.orig 2004-07-19 22:47:11.012755872 +0200 ++++ evolution-1.4.6/calendar/gui/e-day-view.c 2004-07-19 22:50:10.811422320 +0200 +@@ -3235,7 +3235,6 @@ + case GDK_SCROLL_DOWN: + e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE); + return TRUE; +- default: + } + + return FALSE; +@@ -3255,7 +3254,6 @@ + case GDK_SCROLL_DOWN: + e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE); + return TRUE; +- default: + } + + return FALSE; +@@ -4142,7 +4140,7 @@ + const char *uid; + + if (itip_organizer_is_user (event->comp, day_view->client) +- && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (day_view), ++ && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, event->comp, TRUE)) + itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, event->comp, day_view->client, NULL); + +@@ -4279,7 +4277,7 @@ + e_day_view_on_copy (widget, data); + + if (itip_organizer_is_user (event->comp, day_view->client) +- && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (day_view), ++ && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, event->comp, TRUE)) + itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, event->comp, day_view->client, NULL); + +@@ -4915,7 +4913,7 @@ + if (recur_component_dialog (comp, &mod, NULL)) { + if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) { + if (itip_organizer_is_user (comp, day_view->client) && +- send_component_dialog (gtk_widget_get_toplevel (day_view), ++ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, comp, FALSE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL); + } else { +@@ -4926,7 +4924,7 @@ + } + } else if (cal_client_update_object (day_view->client, comp) == CAL_CLIENT_RESULT_SUCCESS) { + if (itip_organizer_is_user (comp, day_view->client) && +- send_component_dialog (gtk_widget_get_toplevel (day_view), ++ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, comp, TRUE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL); + } else { +@@ -4997,7 +4995,7 @@ + if (recur_component_dialog (comp, &mod, NULL)) { + if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) { + if (itip_organizer_is_user (comp, day_view->client) && +- send_component_dialog (gtk_widget_get_toplevel (day_view), ++ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, comp, FALSE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL); + } else { +@@ -5008,7 +5006,7 @@ + } + } else if (cal_client_update_object (day_view->client, comp) == CAL_CLIENT_RESULT_SUCCESS) { + if (itip_organizer_is_user (comp, day_view->client) && +- send_component_dialog (gtk_widget_get_toplevel (day_view), day_view->client, comp, FALSE)) ++ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), day_view->client, comp, FALSE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL); + } else { + g_message ("e_day_view_finish_resize(): Could not update the object!"); +@@ -6631,7 +6629,7 @@ + if (recur_component_dialog (event->comp, &mod, NULL)) { + if (cal_client_update_object_with_mod (day_view->client, event->comp, mod) == CAL_CLIENT_RESULT_SUCCESS) { + if (itip_organizer_is_user (event->comp, day_view->client) +- && send_component_dialog (gtk_widget_get_toplevel (day_view), ++ && send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, event->comp, FALSE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event->comp, + day_view->client, NULL); +@@ -6641,7 +6639,7 @@ + } + } else if (cal_client_update_object (day_view->client, event->comp) == CAL_CLIENT_RESULT_SUCCESS) { + if (itip_organizer_is_user (event->comp, day_view->client) && +- send_component_dialog (gtk_widget_get_toplevel (day_view), ++ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, event->comp, FALSE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event->comp, + day_view->client, NULL); +@@ -7747,7 +7745,7 @@ + if (recur_component_dialog (comp, &mod, NULL)) { + if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) { + if (itip_organizer_is_user (comp, day_view->client) +- && send_component_dialog (gtk_widget_get_toplevel (day_view), ++ && send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, comp, FALSE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, + day_view->client, NULL); +@@ -7759,7 +7757,7 @@ + } else if (cal_client_update_object (day_view->client, comp) + == CAL_CLIENT_RESULT_SUCCESS) { + if (itip_organizer_is_user (comp, day_view->client) && +- send_component_dialog (gtk_widget_get_toplevel (day_view), ++ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, comp, FALSE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, + day_view->client, NULL); +@@ -7878,7 +7876,7 @@ + if (recur_component_dialog (comp, &mod, NULL)) { + if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) { + if (itip_organizer_is_user (comp, day_view->client) +- && send_component_dialog (gtk_widget_get_toplevel (day_view), ++ && send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, comp, FALSE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, + day_view->client, NULL); +@@ -7890,7 +7888,7 @@ + } else if (cal_client_update_object (day_view->client, comp) + == CAL_CLIENT_RESULT_SUCCESS) { + if (itip_organizer_is_user (comp, day_view->client) && +- send_component_dialog (gtk_widget_get_toplevel (day_view), ++ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), + day_view->client, comp, FALSE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, + day_view->client, NULL); +@@ -8078,7 +8076,7 @@ + cal_client_update_object (day_view->client, comp); + + if (itip_organizer_is_user (comp, day_view->client) && +- send_component_dialog (gtk_widget_get_toplevel (day_view), day_view->client, comp, TRUE)) ++ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), day_view->client, comp, TRUE)) + itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL); + + g_object_unref (comp); +--- evolution-1.4.6/mail/message-browser.c.orig 2004-07-19 23:43:18.667794488 +0200 ++++ evolution-1.4.6/mail/message-browser.c 2004-07-19 23:43:32.471695976 +0200 +@@ -344,7 +344,6 @@ + case GDK_Escape: + message_browser_close (NULL, mb, NULL); + return TRUE; +- default: + } + + return FALSE; Index: package/gnome2/evolution/evolution.desc =================================================================== --- package/gnome2/evolution/evolution.desc (revision 4986) +++ package/gnome2/evolution/evolution.desc (working copy) @@ -36,15 +36,15 @@ [U] https://www.ximian.com/products/ximian_evolution/ [A] Ximian -[M] Juergen Sawinski +[M] Juergen Sawinski [C] extra/office extra/desktop/gnome [L] GPL [S] Stable -[V] 1.4.5 +[V] 1.4.6 [P] X -----5---9 543.000 -[D] 2101375018 evolution-1.4.5.tar.bz2 https://ftp.gnome.org/pub/GNOME/sources/evolution/1.4/ +[D] 2229258711 evolution-1.4.6.tar.bz2 https://ftp.gnome.org/pub/GNOME/sources/evolution/1.4/ [D] 2843637332 db-3.1.17.tar.gz https://www.sleepycat.com/update/snapshot/ Index: package/gnome2/evolution/evolution.conf =================================================================== --- package/gnome2/evolution/evolution.conf (revision 4986) +++ package/gnome2/evolution/evolution.conf (working copy) @@ -39,6 +39,8 @@ --enable-pilot-conduits=yes \ --enable-nntp=yes" + pkginstalled openldap && var_append confopt ' ' "--with-openldap=$root/$pkg_openldap_prefix" + # --with-krb5=PREFIX Location of Kerberos 5 libs/includes # --with-krb4=PREFIX Location of Kerberos 4 libs/includes Index: package/gnome2/evolution/evolution.desktop =================================================================== --- package/gnome2/evolution/evolution.desktop (revision 0) +++ package/gnome2/evolution/evolution.desktop (revision 0) @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Evolution +Comment=Groupware +Exec=evolution +Terminal=false +Type=Application +Categories=Office +X-ROCK-Name=evolution Index: package/gnome2/gimp/gimp.desc =================================================================== --- package/gnome2/gimp/gimp.desc (revision 4986) +++ package/gnome2/gimp/gimp.desc (working copy) @@ -44,14 +44,14 @@ [U] https://www.gimp.org [A] The GIMP project -[M] Juergen Sawinski +[M] Juergen Sawinski [C] extra/multimedia extra/desktop/gnome [L] GPL -[S] Beta -[V] 2.0.4 +[S] Stable +[V] 2.0.5 [P] X -----5---9 513.500 -[D] 576172127 gimp-2.0.4.tar.bz2 ftp://ftp.gimp.org/pub/gimp/v2.0/ +[D] 3768535452 gimp-2.0.5.tar.bz2 ftp://ftp.gimp.org/pub/gimp/v2.0/ Index: package/tsa/slrn/slrn-0.9.8.0-ranges.patch =================================================================== --- package/tsa/slrn/slrn-0.9.8.0-ranges.patch (revision 4986) +++ package/tsa/slrn/slrn-0.9.8.0-ranges.patch (working copy) @@ -16,31 +16,3 @@ # version. # # --- ROCK-COPYRIGHT-NOTE-END --- - ---- slrn-0.9.8.0/src/ranges.c 2003-08-02 01:19:39.000000000 +0200 -+++ slrn/src/ranges.c 2003-09-02 14:45:34.000000000 +0200 -@@ -264,13 +264,17 @@ - do - { - /* skip ranges that don't intersect at all */ -- if (b != NULL) -- while ((a != NULL) && (a->max < b->min)) -- a = a->next; -- -- if (a != NULL) -- while ((b != NULL) && (b->max < a->min)) -- b = b->next; -+ do -+ { -+ if (b != NULL) -+ while ((a != NULL) && (a->max < b->min)) -+ a = a->next; -+ -+ if (a != NULL) -+ while ((b != NULL) && (b->max < a->min)) -+ b = b->next; -+ } -+ while ((a!=NULL) && (b!=NULL) && (a->max < b->min)); - - /* append a range containing the next intersection */ - if ((a!=NULL) && (b!=NULL)) Index: package/tsa/slrn/slrn-0.9.8.1-lastchar2.patch =================================================================== --- package/tsa/slrn/slrn-0.9.8.1-lastchar2.patch (revision 0) +++ package/tsa/slrn/slrn-0.9.8.1-lastchar2.patch (revision 0) @@ -0,0 +1,150 @@ +diff -ru slrn-0.9.8.1.orig/src/group.c slrn-0.9.8.1/src/group.c +--- slrn-0.9.8.1.orig/src/group.c 2004-08-15 23:09:31.000000000 +0200 ++++ slrn-0.9.8.1/src/group.c 2004-11-05 23:01:51.391610936 +0100 +@@ -3,7 +3,7 @@ + This file is part of SLRN. + + Copyright (c) 1994, 1999 John E. Davis +- Copyright (c) 2001-2003 Thomas Schultz ++ Copyright (c) 2001-2004 Thomas Schultz + + 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 +@@ -2605,7 +2605,10 @@ + if ((p == pmax) || (p == vline)) + continue; + +- vline[vlen-1] = 0; /* kill \n and NULL terminate */ ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; ++ else ++ vline[vlen] = 0; + + if (-1 == add_group (vline, (unsigned int) (p - vline), + ((ch == '!') ? GROUP_UNSUBSCRIBED : 0), 0, 0)) +diff -ru slrn-0.9.8.1.orig/src/misc.c slrn-0.9.8.1/src/misc.c +--- slrn-0.9.8.1.orig/src/misc.c 2004-09-27 23:30:35.000000000 +0200 ++++ slrn-0.9.8.1/src/misc.c 2004-11-05 23:02:09.519855024 +0100 +@@ -1165,8 +1165,11 @@ + if (vlen == 0) continue; + + line = slrn_safe_malloc (vlen+512); /* add some for MIME overhead */ +- slrn_strncpy (line, vline, vlen); +- line[vlen-1] = 0; /* kill \n and NULL terminate */ ++ strncpy (line, vline, vlen); ++ if (line[vlen-1] == '\n') ++ line[vlen-1] = 0; ++ else ++ line[vlen] = 0; + + if (header) + { +diff -ru slrn-0.9.8.1.orig/src/post.c slrn-0.9.8.1/src/post.c +--- slrn-0.9.8.1.orig/src/post.c 2004-09-28 11:05:54.000000000 +0200 ++++ slrn-0.9.8.1/src/post.c 2004-11-05 23:02:53.936102728 +0100 +@@ -467,7 +467,10 @@ + linenum = 0; + while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n')) + { +- vline[vlen-1] = 0; ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; ++ else ++ vline[vlen] = 0; + linenum++; + if (0 == slrn_case_strncmp ((unsigned char *)vline, + (unsigned char *) "Cc: ", 4)) +@@ -540,7 +543,10 @@ + + while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n')) + { +- vline[vlen-1] = 0; ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; ++ else ++ vline[vlen] = 0; + linenum++; + if (linenum == cc_line) continue; + if (is_empty_header (vline)) continue; +@@ -593,7 +599,10 @@ + + while (NULL != (vline = vgets (vp, &vlen))) + { +- vline[vlen-1] = 0; ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; ++ else ++ vline[vlen] = 0; + fputs (vline, pp); + fputs ("\n", pp); + } +@@ -1411,8 +1420,11 @@ + if (vlen == 0) continue; + + linep = slrn_safe_malloc (vlen+512); /* add some for MIME overhead */ +- slrn_strncpy (linep, vline, vlen); +- linep[vlen-1] = 0; /* kill \n and NULL terminate */ ++ strncpy (linep, vline, vlen); ++ if (linep[vlen-1] == '\n') ++ linep[vlen-1] = 0; /* kill \n and NULL terminate */ ++ else ++ linep[vlen] = 0; + + if (header) + { +diff -ru slrn-0.9.8.1.orig/src/slrnpull.c slrn-0.9.8.1/src/slrnpull.c +--- slrn-0.9.8.1.orig/src/slrnpull.c 2004-02-28 23:08:17.000000000 +0100 ++++ slrn-0.9.8.1/src/slrnpull.c 2004-11-05 23:03:18.859313824 +0100 +@@ -3273,7 +3273,10 @@ + + if (NULL != (vline = vgets (vp, &vlen))) + { +- vline[vlen] = 0; /* make sure line is NULL terminated */ ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; /* make sure line is NULL terminated */ ++ else ++ vline[vlen] = 0; + group->headers = slrn_ranges_from_newsrc_line (vline); + } + +@@ -3382,7 +3385,10 @@ + if (NULL == (group = find_group_type (vline))) + continue; + +- vline[vlen-1] = 0; /* kill \n and NULL terminate */ ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; ++ else ++ vline[vlen] = 0; + + r = slrn_ranges_from_newsrc_line (p+1); + group->requests = slrn_ranges_merge (group->requests, r); +diff -ru slrn-0.9.8.1.orig/src/spool.c slrn-0.9.8.1/src/spool.c +--- slrn-0.9.8.1.orig/src/spool.c 2004-08-15 22:48:13.000000000 +0200 ++++ slrn-0.9.8.1/src/spool.c 2004-11-05 23:04:17.628379568 +0100 +@@ -1757,7 +1757,10 @@ + + if (NULL != (vline = vgets (vp, &vlen))) + { +- vline[vlen] = 0; /* make sure line is NULL terminated */ ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; /* make sure line is NULL terminated */ ++ else ++ vline[vlen] = 0; + retval = slrn_ranges_from_newsrc_line (vline); + } + +@@ -1787,8 +1790,11 @@ + if ((p == pmax) || (p == vline) || + (strncmp(vline, group, (p-vline)))) + continue; +- +- vline[vlen-1] = 0; /* kill \n and NULL terminate */ ++ ++ if (vline[vlen-1] == '\n') ++ vline[vlen-1] = 0; ++ else ++ vline[vlen] = 0; + + retval = slrn_ranges_from_newsrc_line (p+1); + break; Index: package/tsa/slrn/slrn-0.9.8.0-post.patch =================================================================== --- package/tsa/slrn/slrn-0.9.8.0-post.patch (revision 4986) +++ package/tsa/slrn/slrn-0.9.8.0-post.patch (working copy) @@ -16,16 +16,3 @@ # version. # # --- ROCK-COPYRIGHT-NOTE-END --- - ---- slrn-0.9.8.0/src/post.c 2003-07-31 19:21:18.000000000 +0200 -+++ slrn/src/post.c 2003-09-04 23:56:33.000000000 +0200 -@@ -1233,6 +1234,9 @@ - - va_start(ap, fmt); - Slrn_Post_Obj->po_vprintf(fmt, ap); -+ va_end(ap); -+ -+ va_start(ap, fmt); - vfprintf(fcc_fp, fmt, ap); - va_end(ap); - } Index: package/tsa/slrn/slrn-0.9.8.0-mime.patch =================================================================== --- package/tsa/slrn/slrn-0.9.8.0-mime.patch (revision 4986) +++ package/tsa/slrn/slrn-0.9.8.0-mime.patch (working copy) @@ -16,15 +16,3 @@ # version. # # --- ROCK-COPYRIGHT-NOTE-END --- - ---- slrn/src/mime.c~ 2002-11-01 13:32:34.000000000 +0100 -+++ slrn/src/mime.c 2003-11-21 18:39:34.000000000 +0100 -@@ -650,7 +650,7 @@ - l = a->lines; - - /* skip header and separator */ -- while (((l != NULL) && (l->flags & HEADER_LINE)) || l->buf[0] == '\0') -+ while ((l != NULL) && ((l->flags & HEADER_LINE) || l->buf[0] == '\0')) - l = l->next; - - if (l == NULL) return; Index: package/tsa/slrn/slrn.desc =================================================================== --- package/tsa/slrn/slrn.desc (revision 4986) +++ package/tsa/slrn/slrn.desc (working copy) @@ -38,8 +38,8 @@ [L] OpenSource [S] Stable -[V] 0.9.8.0 +[V] 0.9.8.1 [P] X -----5---9 796.000 -[D] 819608956 slrn-0.9.8.0.tar.bz2 https://dl.sourceforge.net/sourceforge/slrn/ +[D] 2716540591 slrn-0.9.8.1.tar.bz2 https://dl.sourceforge.net/sourceforge/slrn/ Index: package/tsa/slrn/slrn-0.9.8.1-fetch.patch =================================================================== --- package/tsa/slrn/slrn-0.9.8.1-fetch.patch (revision 0) +++ package/tsa/slrn/slrn-0.9.8.1-fetch.patch (revision 0) @@ -0,0 +1,30 @@ +--- slrn-0.9.8.1/src/slrnpull.c 2004-02-28 23:08:17.000000000 +0100 ++++ slrn/src/slrnpull.c 2004-10-10 01:42:31.000000000 +0200 +@@ -1647,7 +1647,7 @@ + || (((unsigned int)server_max <= gmax) && (gmin <= gmax))) + { + log_message (_("%s: no new articles available."), g->name); +- return 0; ++ goto fetch_marked_bodies; + } + + Num_Duplicates = 0; +@@ -1667,7 +1667,7 @@ + g->max = g->server_max; + log_message (_("%s: No new articles available."), g->name); + slrn_free ((char *) numbers); +- return 0; ++ goto fetch_marked_bodies; + } + + log_message (_("%s: %u articles available."), g->name, num_numbers - i); +@@ -1716,7 +1716,8 @@ + } + + /* Now, fetch marked article bodies. */ +- ++ ++ fetch_marked_bodies: + /* Don't request bodies that are no longer there. */ + if (server_min > 1) + g->requests = slrn_ranges_remove (g->requests, 1, server_min-1); Index: package/rene/sylpheed/sylpheed.conf =================================================================== --- package/rene/sylpheed/sylpheed.conf (revision 4986) +++ package/rene/sylpheed/sylpheed.conf (working copy) @@ -22,5 +22,5 @@ . $base/package/*/*/gnome-14.conf -confopt="$confopt --enable-gpgme --enable-threads --enable-ssl" +confopt="$confopt --enable-threads --enable-ssl" Index: package/rene/sylpheed/sylpheed.desc =================================================================== --- package/rene/sylpheed/sylpheed.desc (revision 4986) +++ package/rene/sylpheed/sylpheed.desc (working copy) @@ -39,7 +39,7 @@ [L] GPL [S] Stable -[V] 0.9.7 +[V] 0.9.12 [P] X -----5---9 551.000 -[D] 2192879723 sylpheed-0.9.7.tar.bz2 https://sylpheed.good-day.net/sylpheed/ +[D] 0 sylpheed-0.9.12.tar.bz2 https://sylpheed.good-day.net/sylpheed/ Index: package/rene/xpdf/xpdf-3.00pl1-overflowfix.patch.xpdf =================================================================== --- package/rene/xpdf/xpdf-3.00pl1-overflowfix.patch.xpdf (revision 0) +++ package/rene/xpdf/xpdf-3.00pl1-overflowfix.patch.xpdf (revision 0) @@ -0,0 +1,231 @@ +--- ./xpdf/XRef.cc.orig 2004-11-24 15:01:16.444656632 +0100 ++++ ./xpdf/XRef.cc 2004-11-24 15:00:57.007611512 +0100 +@@ -96,7 +96,7 @@ + } + nObjects = obj1.getInt(); + obj1.free(); +- if (nObjects == 0) { ++ if (nObjects <= 0) { + goto err1; + } + +@@ -106,6 +106,9 @@ + } + first = obj1.getInt(); + obj1.free(); ++ if (first < 0) { ++ goto err1; ++ } + + objs = new Object[nObjects]; + objNums = (int *)gmalloc(nObjects * sizeof(int)); +@@ -130,6 +133,12 @@ + offsets[i] = obj2.getInt(); + obj1.free(); + obj2.free(); ++ if (objNums[i] < 0 || offsets[i] < 0 || ++ (i > 0 && offsets[i] < offsets[i-1])) { ++ delete parser; ++ gfree(offsets); ++ goto err1; ++ } + } + while (str->getChar() != EOF) ; + delete parser; +@@ -369,10 +378,16 @@ + } + n = obj.getInt(); + obj.free(); ++ if (first < 0 || n < 0 || first + n < 0) { ++ goto err1; ++ } + if (first + n > size) { + for (newSize = size ? 2 * size : 1024; +- first + n > newSize; ++ first + n > newSize && newSize > 0; + newSize <<= 1) ; ++ if (newSize < 0) { ++ goto err1; ++ } + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { + entries[i].offset = 0xffffffff; +@@ -443,7 +458,7 @@ + + // check for an 'XRefStm' key + if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) { +- pos2 = obj2.getInt(); ++ pos2 = (Guint)obj2.getInt(); + readXRef(&pos2); + if (!ok) { + goto err1; +@@ -474,6 +489,9 @@ + } + newSize = obj.getInt(); + obj.free(); ++ if (newSize < 0) { ++ goto err1; ++ } + if (newSize > size) { + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { +@@ -494,6 +512,9 @@ + } + w[i] = obj2.getInt(); + obj2.free(); ++ if (w[i] < 0 || w[i] > 4) { ++ goto err1; ++ } + } + obj.free(); + +@@ -513,13 +534,14 @@ + } + n = obj.getInt(); + obj.free(); +- if (!readXRefStreamSection(xrefStr, w, first, n)) { ++ if (first < 0 || n < 0 || ++ !readXRefStreamSection(xrefStr, w, first, n)) { + idx.free(); + goto err0; + } + } + } else { +- if (!readXRefStreamSection(xrefStr, w, 0, size)) { ++ if (!readXRefStreamSection(xrefStr, w, 0, newSize)) { + idx.free(); + goto err0; + } +@@ -551,10 +573,16 @@ + Guint offset; + int type, gen, c, newSize, i, j; + ++ if (first + n < 0) { ++ return gFalse; ++ } + if (first + n > size) { + for (newSize = size ? 2 * size : 1024; +- first + n > newSize; ++ first + n > newSize && newSize > 0; + newSize <<= 1) ; ++ if (newSize < 0) { ++ return gFalse; ++ } + entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); + for (i = size; i < newSize; ++i) { + entries[i].offset = 0xffffffff; +@@ -585,24 +613,26 @@ + } + gen = (gen << 8) + c; + } +- switch (type) { +- case 0: +- entries[i].offset = offset; +- entries[i].gen = gen; +- entries[i].type = xrefEntryFree; +- break; +- case 1: +- entries[i].offset = offset; +- entries[i].gen = gen; +- entries[i].type = xrefEntryUncompressed; +- break; +- case 2: +- entries[i].offset = offset; +- entries[i].gen = gen; +- entries[i].type = xrefEntryCompressed; +- break; +- default: +- return gFalse; ++ if (entries[i].offset == 0xffffffff) { ++ switch (type) { ++ case 0: ++ entries[i].offset = offset; ++ entries[i].gen = gen; ++ entries[i].type = xrefEntryFree; ++ break; ++ case 1: ++ entries[i].offset = offset; ++ entries[i].gen = gen; ++ entries[i].type = xrefEntryUncompressed; ++ break; ++ case 2: ++ entries[i].offset = offset; ++ entries[i].gen = gen; ++ entries[i].type = xrefEntryCompressed; ++ break; ++ default: ++ return gFalse; ++ } + } + } + +@@ -664,38 +694,44 @@ + // look for object + } else if (isdigit(*p)) { + num = atoi(p); +- do { +- ++p; +- } while (*p && isdigit(*p)); +- if (isspace(*p)) { ++ if (num > 0) { + do { + ++p; +- } while (*p && isspace(*p)); +- if (isdigit(*p)) { +- gen = atoi(p); ++ } while (*p && isdigit(*p)); ++ if (isspace(*p)) { + do { + ++p; +- } while (*p && isdigit(*p)); +- if (isspace(*p)) { ++ } while (*p && isspace(*p)); ++ if (isdigit(*p)) { ++ gen = atoi(p); + do { + ++p; +- } while (*p && isspace(*p)); +- if (!strncmp(p, "obj", 3)) { +- if (num >= size) { +- newSize = (num + 1 + 255) & ~255; +- entries = (XRefEntry *) +- grealloc(entries, newSize * sizeof(XRefEntry)); +- for (i = size; i < newSize; ++i) { +- entries[i].offset = 0xffffffff; +- entries[i].type = xrefEntryFree; ++ } while (*p && isdigit(*p)); ++ if (isspace(*p)) { ++ do { ++ ++p; ++ } while (*p && isspace(*p)); ++ if (!strncmp(p, "obj", 3)) { ++ if (num >= size) { ++ newSize = (num + 1 + 255) & ~255; ++ if (newSize < 0) { ++ error(-1, "Bad object number"); ++ return gFalse; ++ } ++ entries = (XRefEntry *) ++ grealloc(entries, newSize * sizeof(XRefEntry)); ++ for (i = size; i < newSize; ++i) { ++ entries[i].offset = 0xffffffff; ++ entries[i].type = xrefEntryFree; ++ } ++ size = newSize; ++ } ++ if (entries[num].type == xrefEntryFree || ++ gen >= entries[num].gen) { ++ entries[num].offset = pos - start; ++ entries[num].gen = gen; ++ entries[num].type = xrefEntryUncompressed; + } +- size = newSize; +- } +- if (entries[num].type == xrefEntryFree || +- gen >= entries[num].gen) { +- entries[num].offset = pos - start; +- entries[num].gen = gen; +- entries[num].type = xrefEntryUncompressed; + } + } + } Index: package/rene/xpdf/xpdf.desc =================================================================== --- package/rene/xpdf/xpdf.desc (revision 4986) +++ package/rene/xpdf/xpdf.desc (working copy) @@ -35,7 +35,7 @@ [L] GPL [S] Stable -[V] 3.00 +[V] 3.00pl1 [P] X -------7-9 373.000 [SRC] . Index: package/rene/samba/samba.desc =================================================================== --- package/rene/samba/samba.desc (revision 4986) +++ package/rene/samba/samba.desc (working copy) @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 3.0.8 +[V] 3.0.9 [P] X -----5---9 727.000 -[D] 3701972489 samba-3.0.8.tar.gz ftp://de.samba.org/samba.org/ +[D] 0 samba-3.0.9.tar.gz ftp://de.samba.org/samba.org/ Index: package/rene/sudo/sudo.desc =================================================================== --- package/rene/sudo/sudo.desc (revision 4986) +++ package/rene/sudo/sudo.desc (working copy) @@ -37,8 +37,8 @@ [L] BSD [S] Stable -[V] 1.6.7p3 +[V] 1.6.8p3 [P] X -----5---9 672.000 -[D] 2088658627 sudo-1.6.7p3.tar.gz ftp://ftp.cs.colorado.edu/pub/sudo/ +[D] 3080511945 sudo-1.6.8p5.tar.gz ftp://ftp.cs.colorado.edu/pub/sudo/ Index: package/rene/sudo/sudo.conf =================================================================== --- package/rene/sudo/sudo.conf (revision 4986) +++ package/rene/sudo/sudo.conf (working copy) @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -extraconfopt="--with-insults --with-all-insults --enable-log-host --with-tty-tickets" +extraconfopt="--with-insults --with-all-insults --enable-log-host --with-tty-tickets --enable-logging" Index: package/rene/sane-frontends/sane-frontends.desc =================================================================== --- package/rene/sane-frontends/sane-frontends.desc (revision 4986) +++ package/rene/sane-frontends/sane-frontends.desc (working copy) @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 1.0.12 +[V] 1.0.13 [P] X -----5---9 579.000 -[D] 2428105225 sane-frontends-1.0.12.tar.gz ftp://ftp.mostang.com/pub/sane/sane-frontends-1.0.12/ +[D] 2446877634 sane-frontends-1.0.13.tar.gz ftp://ftp.mostang.com/pub/sane/sane-frontends-1.0.13/ Index: package/rene/sane-backends/sane-backends.desc =================================================================== --- package/rene/sane-backends/sane-backends.desc (revision 4986) +++ package/rene/sane-backends/sane-backends.desc (working copy) @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 1.0.14 +[V] 1.0.15 [P] X -----5---9 566.000 -[D] 441721824 sane-backends-1.0.14.tar.gz ftp://ftp.mostang.com/pub/sane/sane-backends-1.0.14/ +[D] 209856734 sane-backends-1.0.15.tar.gz ftp://ftp.mostang.com/pub/sane/sane-backends-1.0.15/ Index: package/rene/vim/vim.conf =================================================================== --- package/rene/vim/vim.conf (revision 4986) +++ package/rene/vim/vim.conf (working copy) @@ -42,11 +42,8 @@ ln -sf $bindir/vim $bindir/vi fi - # now hopefully all are happy ;-) - - cp -fv $confdir/vimrc* $root/$prefix/share/ } -var_append extraconfopt ' ' "--enable-max-features --enable-perlinterp --enable-pythoninterp" +var_append extraconfopt ' ' "--enable-multibyte --enable-max-features --enable-perlinterp --enable-pythoninterp" postmake="vim_postmake" Index: package/rene/vim/vimrc =================================================================== --- package/rene/vim/vimrc (revision 4986) +++ package/rene/vim/vimrc (working copy) @@ -1,5 +0,0 @@ -:set esckeys -:set background=dark -:set ruler -:syntax on - Index: package/rene/vim/perl-name-clash.patch =================================================================== --- package/rene/vim/perl-name-clash.patch (revision 4986) +++ package/rene/vim/perl-name-clash.patch (working copy) @@ -1,47 +0,0 @@ -# --- 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/rene/vim/perl-name-clash.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at https://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -This is a temporary rename since a global variable name is now also used as -as name inside an enum in perl ... - - - Rene Rebe - ---- vim62/src/globals.h.orig 2003-09-30 16:51:07.000000000 +0200 -+++ vim62/src/globals.h 2003-09-30 16:52:00.000000000 +0200 -@@ -1253,7 +1253,7 @@ - EXTERN char_u e_nowrtmsg[] INIT(=N_("E37: No write since last change (add ! to override)")); - EXTERN char_u e_null[] INIT(=N_("E38: Null argument")); - #ifdef FEAT_DIGRAPHS --EXTERN char_u e_number[] INIT(=N_("E39: Number expected")); -+EXTERN char_u e_number_exp[] INIT(=N_("E39: Number expected")); - #endif - #ifdef FEAT_QUICKFIX - EXTERN char_u e_openerrf[] INIT(=N_("E40: Can't open errorfile %s")); ---- vim62/src/digraph.c.orig 2003-09-30 16:51:28.000000000 +0200 -+++ vim62/src/digraph.c 2003-09-30 16:51:48.000000000 +0200 -@@ -2175,7 +2175,7 @@ - str = skipwhite(str); - if (!isdigit(*str)) - { -- EMSG(_(e_number)); -+ EMSG(_(e_number_exp)); - return; - } - n = getdigits(&str); Index: package/rene/vim/vim.desc =================================================================== --- package/rene/vim/vim.desc (revision 4986) +++ package/rene/vim/vim.desc (working copy) @@ -52,8 +52,8 @@ [L] OpenSource [S] Stable -[V] 6.2 +[V] 6.3 [P] X -----5---9 580.000 -[D] 1471783944 vim-6.2.tar.bz2 ftp://ftp.vim.org/pub/vim/unix/ +[D] 0 vim-6.3.tar.bz2 ftp://ftp.vim.org/pub/vim/unix/ Index: package/rene/vim/vimrc-euro =================================================================== --- package/rene/vim/vimrc-euro (revision 4986) +++ package/rene/vim/vimrc-euro (working copy) @@ -1,2 +0,0 @@ -:set guifont=-b&h-lucidatypewriter-medium-r-normal-*-*-140-*-*-m-*-iso8859-15 -:set encoding=iso-8859-15 Index: package/rene/gpgme/gpgme.conf =================================================================== --- package/rene/gpgme/gpgme.conf (revision 0) +++ package/rene/gpgme/gpgme.conf (revision 0) @@ -0,0 +1 @@ +var_append makeopt ' ' "CFLAGS='-lassuan'" Index: package/rene/gpgme/gpgme.desc =================================================================== --- package/rene/gpgme/gpgme.desc (revision 4986) +++ package/rene/gpgme/gpgme.desc (working copy) @@ -35,8 +35,8 @@ [L] GPL [S] Stable -[V] 0.4.0 +[V] 1.0.0 [P] X -----5---9 263.000 -[D] 2214706672 gpgme-0.4.0.tar.gz ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/ +[D] 571052920 gpgme-1.0.0.tar.gz ftp://ftp.cert.dfn.de/pub/tools/crypt/gcrypt/gpgme/ Index: package/rene/gpa/gpa.desc =================================================================== --- package/rene/gpa/gpa.desc (revision 4986) +++ package/rene/gpa/gpa.desc (working copy) @@ -33,8 +33,8 @@ [L] GPL [S] Beta -[V] 0.6.1 +[V] 0.7.0 [P] X -----5---9 578.000 -[D] 1603741271 gpa-0.6.1.tar.gz ftp://ftp.gnupg.org/gcrypt/alpha/gpa/ +[D] 0 gpa-0.7.0.tar.gz ftp://ftp.gnupg.org/gcrypt/alpha/gpa/ Index: package/misc/zsh/zsh.desc =================================================================== --- package/misc/zsh/zsh.desc (revision 4986) +++ package/misc/zsh/zsh.desc (working copy) @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 4.1.1 +[V] 4.2.1 [P] X ---3-5---9 155.000 -[D] 1685785161 zsh-4.1.1.tar.bz2 ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ -[D] 0897396870 zsh-4.1.1-doc.tar.bz2 ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ +[D] 1479038705 zsh-4.2.1.tar.bz2 ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ +[D] 1728638845 zsh-4.2.1-doc.tar.bz2 ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ Index: package/misc/zsh/zsh.conf =================================================================== --- package/misc/zsh/zsh.conf (revision 4986) +++ package/misc/zsh/zsh.conf (working copy) @@ -25,3 +25,5 @@ ln -sfv $root/usr/bin/zsh $root/bin/zsh } postmake="pkg_zsh_postmake" +var_append confopt " " --with-tcsetpgrp + Index: package/stefanp/kphone/kphone.desc =================================================================== --- package/stefanp/kphone/kphone.desc (revision 0) +++ package/stefanp/kphone/kphone.desc (revision 0) @@ -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/stefanp/kphone/kphone.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 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 https://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] An Internet Protocol phone using the SIP protocol + +[T] KPhone is an Internet Protocol phone based on the Qt toolkit, using +[T] the SIP protocol. It supports Presence and Instant Messaging, and +[T] to some extent also video calls between two hosts. Also supported +[T] is STUN tunneling to work through NAT and firewalls. + +[U] https://www.wirlab.net/kphone/ KPhone homepage + +[A] Billy Biggs +[A] Wirlab +[M] Stefan Paletta + +[C] extra/network + +[L] GPL +[S] Stable +[V] 4.0.5 +[P] X -?---5---9 199.400 + +[D] 2837713920 kphone-4.0.5.tar.gz https://www.wirlab.net/kphone/ + Index: package/blindcoder/licq/licq.desktop =================================================================== --- package/blindcoder/licq/licq.desktop (revision 0) +++ package/blindcoder/licq/licq.desktop (revision 0) @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Licq +Comment=ICQ Client +Exec=licq +Terminal=false +Type=Application +Categories=Network;InstantMessaging +X-ROCK-Name=licq Index: package/blindcoder/licq/licq.desc =================================================================== --- package/blindcoder/licq/licq.desc (revision 4986) +++ package/blindcoder/licq/licq.desc (working copy) @@ -36,8 +36,8 @@ [L] GPL [S] Stable -[V] 1.2.7 +[V] 1.3.0 [P] X -----5---9 817.000 -[D] 3084120082 licq-1.2.7.tar.bz2 https://download.sourceforge.net/licq/ +[D] 2730649474 licq-1.3.0.tar.bz2 https://download.sourceforge.net/licq/ Index: package/blindcoder/licq/config.hlp =================================================================== --- package/blindcoder/licq/config.hlp (revision 4986) +++ package/blindcoder/licq/config.hlp (working copy) @@ -33,6 +33,12 @@ using KDE. This needs the KDE-Libraries and will interface nicely with the K Desktop Environmant. +ROCKCFG_PKG_LICQ_OSD + Please check here if you want to build the OSD Plugin. This plugin + displays a message via an On Screen Display to inform you of status + changes and messages. VERY useful if you have only one audio channel + and similiar circumstances. + ROCKCFG_PKG_LICQ_REPLY Please check here if you want to build the autoreplier plugin. Index: package/blindcoder/licq/config.in =================================================================== --- package/blindcoder/licq/config.in (revision 4986) +++ package/blindcoder/licq/config.in (working copy) @@ -24,9 +24,10 @@ then menu_begin MENU_PKG_LICQ 'LICQ Options' block_begin 3 - bool "Build the CLI" ROCKCFG_PKG_LICQ_CLI 1 + bool "Build the CLI" ROCKCFG_PKG_LICQ_CLI 0 bool "Build the QT-GUI" ROCKCFG_PKG_LICQ_QTG 1 bool "Build the KDE-GUI" ROCKCFG_PKG_LICQ_KDE 1 + pkgcheck xosd X && bool "Build the OSD Pluin" ROCKCFG_PKG_LICQ_OSD 1 bool "Build the Auto-Replier" ROCKCFG_PKG_LICQ_REPLY 1 bool "Build the Forwarder" ROCKCFG_PKG_LICQ_EMAIL 1 bool "Build the Remote Management Service Plugin" ROCKCFG_PKG_LICQ_RMS 0 Index: package/blindcoder/licq/licq.conf =================================================================== --- package/blindcoder/licq/licq.conf (revision 4986) +++ package/blindcoder/licq/licq.conf (working copy) @@ -24,7 +24,7 @@ licq_custmain () { export CPPFLAGS=-Wno-deprecated - eval ./configure $confopt + eval ./configure $confopt --disable-gpgme eval $MAKE $makeopt ; eval $MAKE $makeopt install if [ $ROCKCFG_PKG_LICQ_CLI == 1 ] ; then @@ -42,6 +42,11 @@ eval ./configure $confopt --with-kde eval $MAKE $makeopt ; eval $MAKE $makeopt install fi + if [ $ROCKCFG_PKG_LICQ_OSD == 1 ] ; then + cd $builddir/licq-$ver/plugins/osd + eval ./configure $confopt + eval $MAKE $makeopt ; eval $MAKE $makeopt install + fi if [ $ROCKCFG_PKG_LICQ_RMS == 1 ] ; then cd $builddir/licq-$ver/plugins/rms eval ./configure $confopt Index: package/blindcoder/libcdk/libcdk.desc =================================================================== --- package/blindcoder/libcdk/libcdk.desc (revision 0) +++ package/blindcoder/libcdk/libcdk.desc (revision 0) @@ -0,0 +1,40 @@ + +[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/blindcoder/libcdk/libcdk.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 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 https://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] Curses Development Kit + +[T] A library of widgets for curses development. + +[U] https://invisible-island.net/cdk + +[A] T.E.Dickey +[M] Benjamin Schieder + +[C] extra/development + +[L] BSD +[S] Stable +[V] 4.9.11-20040831 +[P] X -----5---9 203.899 + +[D] 0 cdk.tar.gz ftp://invisible-island.net/cdk/ Index: package/base/e2fsprogs/et-dietlibc.patch =================================================================== --- package/base/e2fsprogs/et-dietlibc.patch (revision 4986) +++ package/base/e2fsprogs/et-dietlibc.patch (working copy) @@ -25,7 +25,7 @@ (However this only happens on soem platforms like SPARC, x86 and PowerPC also mis- comput the base, but in another way ...) - - Rene Rebe + - Rene Rebe diff -ur e2fsprogs-1.34-orig/lib/et/et_c.awk e2fsprogs-1.34/lib/et/et_c.awk --- e2fsprogs-1.34-orig/lib/et/et_c.awk 2003-05-06 05:07:31.000000000 +0200 Index: package/base/e2fsprogs/e2fsprogs.desc =================================================================== --- package/base/e2fsprogs/e2fsprogs.desc (revision 4986) +++ package/base/e2fsprogs/e2fsprogs.desc (working copy) @@ -36,8 +36,8 @@ [L] GPL LGPL [S] Stable -[V] 1.34 +[V] 1.35 [P] X -1-3-----9 718.000 -[D] 2173527069 e2fsprogs-1.34.tar.gz https://download.sourceforge.net/e2fsprogs/ +[D] 3249790506 e2fsprogs-1.35.tar.gz https://download.sourceforge.net/e2fsprogs/ Index: package/base/openssh/openssh.desc =================================================================== --- package/base/openssh/openssh.desc (revision 4986) +++ package/base/openssh/openssh.desc (working copy) @@ -46,8 +46,8 @@ [L] OpenSource [S] Stable -[V] 3.8p1 +[V] 3.9p1 [P] X -----5---9 798.000 -[D] 2968697937 openssh-3.8p1.tar.gz ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ +[D] 2159889493 openssh-3.9p1.tar.gz ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ Index: package/base/gnupg/gnupg.desc =================================================================== --- package/base/gnupg/gnupg.desc (revision 4986) +++ package/base/gnupg/gnupg.desc (working copy) @@ -48,10 +48,10 @@ [L] GPL [S] Stable -[V] 1.2.4 +[V] 1.2.6 [P] X -----5---9 262.000 [SRC] pg -[D] 3841770975 gnupg-1.2.4.tar.gz ftp://ftp.gnupg.org/gcrypt/gnupg/ +[D] 2158641696 gnupg-1.2.6.tar.gz ftp://ftp.gnupg.org/gcrypt/gnupg/ [D] 3598666848 pgpgpg-0.13.tar.gz https://www.nessie.de/mroth/pgpgpg/ Index: package/base/dmapi/buildmacros.patch =================================================================== --- package/base/dmapi/buildmacros.patch (revision 0) +++ package/base/dmapi/buildmacros.patch (revision 0) @@ -0,0 +1,11 @@ +--- ./include/buildmacros.orig 2004-12-05 08:09:03.778078400 +0100 ++++ ./include/buildmacros 2004-12-05 08:09:15.082359888 +0100 +@@ -102,8 +102,6 @@ + ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ + ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ + ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ + ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) Index: package/base/dmapi/install.patch =================================================================== --- package/base/dmapi/install.patch (revision 0) +++ package/base/dmapi/install.patch (revision 0) @@ -0,0 +1,83 @@ +# --- 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/base/dmapi/install.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at https://www.opensource.org/ (e.g. BSD, X11) or 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. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +--- ./install-sh.orig 2002-06-05 01:07:56.000000000 +0200 ++++ ./install-sh 2003-04-15 07:42:07.000000000 +0200 +@@ -122,9 +122,9 @@ + + if $INSTALL + then +- CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown ++ MV=mv; CP=cp; LN=ln; MKDIR=mkdir; CHMOD=chmod; CHOWN=_chown + else +- CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true ++ MV=mv; CP=true; LN=true; MKDIR=true; CHMOD=true; CHOWN=true + fi + + [ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true +@@ -229,7 +229,8 @@ + if [ $cnt -eq 5 ] + then + install_name=$target/$solib +- $CP $solib $install_name ++ $CP $solib $install_name.new ++ $MV $install_name.new $install_name + status=$? + $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} + break +@@ -280,7 +281,8 @@ + ;; + old_lib) + install_name=$target/$old_library +- $CP $old_library $install_name ++ $CP $old_library $install_name.new ++ $MV $install_name.new $install_name + status=$? + $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} + ;; +@@ -314,7 +316,13 @@ + then + mkdir -p `dirname $dir` + fi +- $CP $f $dir ++ if test -d $dir; then ++ $CP $f $dir/${f##*/}.new ++ $MV $dir/${f##*/}.new $dir/${f##*/} ++ else ++ $CP $f $dir.new ++ $MV $dir.new $dir ++ fi + status=$? + if [ $status -eq 0 ] + then +@@ -357,7 +365,13 @@ + + for f in $list + do +- $CP $f $dir ++ if test -d $dir; then ++ $CP $f $dir/${f##*/}.new ++ $MV $dir/${f##*/}.new $dir/${f##*/} ++ else ++ $CP $f $dir.new ++ $MV $dir.new $dir ++ fi + status=$? + if [ $status -eq 0 ] + then Index: package/base/dmapi/dmapi.desc =================================================================== --- package/base/dmapi/dmapi.desc (revision 0) +++ package/base/dmapi/dmapi.desc (revision 0) @@ -0,0 +1,43 @@ +[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/hannes/dmapi/dmapi.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 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 https://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] the data management library for the xfs filesystem + +[T] DMAPI, or XDSM, is an implementation of the X/Open document: Systems +[T] Management: Data Storage Management (XDSM) API dated February 1997. +[T] This interface is made available for the XFS filesystem by means of the +[T] libdm library. + +[U] https://oss.sgi.com/projects/xfs/ + +[A] SGI XFS development team +[M] hannes + +[C] extra/filesystem + +[L] GPL +[S] Stable +[V] 2.2.1 +[P] X -?---5---9 183.700 + +[D] 3097608772 dmapi-2.2.1.src.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/ + Index: package/base/dmapi/dmapi.conf =================================================================== --- package/base/dmapi/dmapi.conf (revision 0) +++ package/base/dmapi/dmapi.conf (revision 0) @@ -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/hannes/dmapi/dmapi.conf +# ROCK Linux is Copyright (C) 1998 - 2004 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 https://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + + +# take the config options from xfsprogs.conf + +makeinstopt="$makeinstopt install-dev" +var_append confopt ' ' "--libexecdir='$libdir'" +libdir="$root/lib" Index: package/base/tcpdump/gcc34.patch =================================================================== --- package/base/tcpdump/gcc34.patch (revision 0) +++ package/base/tcpdump/gcc34.patch (revision 0) @@ -0,0 +1,55 @@ + +diff -ruN tcpdump-3.8.3/configure tcpdump-3.8.3-new/configure +--- tcpdump-3.8.3/configure 2004-03-28 23:06:09.000000000 +0200 ++++ tcpdump-3.8.3-new/configure 2004-05-15 23:20:01.829813808 +0200 +@@ -8879,6 +8879,9 @@ + int + main () + { ++ return_pcap_debug(); ++ return 0; ++} + + int + return_pcap_debug(void) +@@ -8887,10 +8890,8 @@ + + return pcap_debug; + } ++; + +- ; +- return 0; +-} + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +@@ -8938,18 +8939,19 @@ + int + main () + { ++ return_yydebug(); ++ return 0; ++} + +- int +- return_yydebug(void) +- { +- extern int yydebug; +- +- return yydebug; +- } ++int ++return_yydebug(void) ++{ ++ extern int yydebug; + +- ; +- return 0; ++ return yydebug; + } ++; ++ + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 Index: package/base/tcpdump/tcpdump.desc =================================================================== --- package/base/tcpdump/tcpdump.desc (revision 4986) +++ package/base/tcpdump/tcpdump.desc (working copy) @@ -33,8 +33,8 @@ [L] OpenSource [S] Stable -[V] 3.7.2 +[V] 3.8.3 [P] X -----5---9 260.000 -[D] 2621478327 tcpdump-3.7.2.tar.gz https://www.tcpdump.org/release/ +[D] 2943042777 tcpdump-3.8.3.tar.gz https://www.tcpdump.org/release/ Index: package/base/modutils/modutils.desc =================================================================== --- package/base/modutils/modutils.desc (revision 4986) +++ package/base/modutils/modutils.desc (working copy) @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 2.4.26 +[V] 2.4.27 [P] X -1-3-----9 745.000 -[D] 3009681914 modutils-2.4.26.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/ +[D] 3021487810 modutils-2.4.27.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/ Index: package/base/tcsh/tcsh.desc =================================================================== --- package/base/tcsh/tcsh.desc (revision 4986) +++ package/base/tcsh/tcsh.desc (working copy) @@ -34,8 +34,8 @@ [L] OpenSource [S] Stable -[V] 6.12.00 +[V] 6.13.00 [P] X -----5---9 156.000 -[D] 1063803335 tcsh-6.12.00.tar.gz ftp://ftp.funet.fi/pub/unix/shells/tcsh/ +[D] 3140777107 tcsh-6.13.00.tar.gz ftp://ftp.funet.fi/pub/unix/shells/tcsh/ Index: package/base/glibc22/glibc22.conf =================================================================== --- package/base/glibc22/glibc22.conf (revision 4986) +++ package/base/glibc22/glibc22.conf (working copy) @@ -36,7 +36,7 @@ # code so we can use this glibc to debug other programs. CFLAGS="$CFLAGS -g -DNDEBUG=1" ./configure --with-gnu-binutils \ --enable-add-ons --enable-profile \ - --with-headers=$root/usr/include/linux \ + --with-headers=$root/usr/include \ --with-gd=/usr \ --with-gd-lib=/usr/lib \ --with-gd-include=/usr/include \ Index: package/base/tar/tar.desc =================================================================== --- package/base/tar/tar.desc (revision 4986) +++ package/base/tar/tar.desc (working copy) @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 1.13 +[V] 1.14 [P] X -1---5---9 171.000 -[D] 153743414 tar-1.13.tar.gz ftp://ftp.gnu.org/pub/gnu/tar/ +[D] 328428970 tar-1.14.tar.bz2 ftp://ftp.gnu.org/gnu/tar/ Index: package/base/tar/fix_getdate_c.patch =================================================================== --- package/base/tar/fix_getdate_c.patch (revision 0) +++ package/base/tar/fix_getdate_c.patch (revision 0) @@ -0,0 +1,11 @@ + +--- ./lib/getdate.c.orig 2004-06-24 13:40:15.672819408 +0200 ++++ ./lib/getdate.c 2004-06-24 13:43:11.842037616 +0200 +@@ -54,6 +54,7 @@ + #endif + + #include ++#include + + /* Since the code of getdate.y is not included in the Emacs executable + itself, there is no need to #define static in this file. Even if Index: package/base/tar/compar_does_not_need_fd.h.patch =================================================================== --- package/base/tar/compar_does_not_need_fd.h.patch (revision 0) +++ package/base/tar/compar_does_not_need_fd.h.patch (revision 0) @@ -0,0 +1,15 @@ + +--- ./src/compare.c.orig 2004-06-24 13:49:08.444825752 +0200 ++++ ./src/compare.c 2004-06-24 13:47:15.575984424 +0200 +@@ -31,9 +31,11 @@ + }; + #endif + ++#if 0 + #if HAVE_LINUX_FD_H + # include + #endif ++#endif + + #include + Index: package/base/tar/fix_no_ascii_char.patch =================================================================== --- package/base/tar/fix_no_ascii_char.patch (revision 4986) +++ package/base/tar/fix_no_ascii_char.patch (working copy) @@ -1,30 +0,0 @@ -# --- 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/base/tar/fix_no_ascii_char.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at https://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./tests/genfile.c.orig 2003-07-27 23:44:12.000000000 -0400 -+++ ./tests/genfile.c 2003-07-27 23:44:27.000000000 -0400 -@@ -164,7 +164,7 @@ - stdout); - fputs (_("\ - \n\ --Written by François Pinard .\n"), -+Written by Francois Pinard .\n"), - stdout); - exit (EXIT_SUCCESS); - } Index: package/base/tar/tar-bzip2.patch =================================================================== --- package/base/tar/tar-bzip2.patch (revision 4986) +++ package/base/tar/tar-bzip2.patch (working copy) @@ -17,71 +17,57 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- - -Patch by Hiroshi Takekawa to integrate bzip2 compression filter (option -I) - - - Clifford - ---- ./src/tar.c.orig Wed Jul 7 07:49:50 1999 -+++ ./src/tar.c Sun Jul 11 17:25:49 1999 -@@ -16,6 +16,11 @@ - with this program; if not, write to the Free Software Foundation, Inc., - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -+/* 13 Oct 97: patched by Hiroshi Takekawa to integrate bzip2 as -+ compression filter (option -j, -y and -I) */ -+/* 2002-07-16: patched by Anders Karlsson to integrate bzip2 as -+ compression filter (with the aditional options -j and -y) */ -+ - #include "system.h" - - #include -@@ -164,6 +167,12 @@ - {"block-number", no_argument, NULL, 'R'}, - {"block-size", required_argument, NULL, OBSOLETE_BLOCKING_FACTOR}, - {"blocking-factor", required_argument, NULL, 'b'}, -+ {"bzip2", no_argument, NULL, 'j'}, -+ {"bunzip2", no_argument, NULL, 'j'}, -+ {"bzip2", no_argument, NULL, 'y'}, -+ {"bunzip2", no_argument, NULL, 'y'}, -+ {"bzip2", no_argument, NULL, 'I'}, -+ {"bunzip2", no_argument, NULL, 'I'}, - {"catenate", no_argument, NULL, 'A'}, - {"checkpoint", no_argument, &checkpoint_option, 1}, - {"compare", no_argument, NULL, 'd'}, -@@ -340,6 +345,7 @@ +--- ./src/tar.c.orig 2004-04-04 11:53:30.000000000 +0200 ++++ ./src/tar.c 2004-06-24 13:48:06.757203696 +0200 +@@ -239,6 +239,8 @@ + {"block-number", no_argument, 0, 'R'}, + {"blocking-factor", required_argument, 0, 'b'}, + {"bzip2", no_argument, 0, 'j'}, ++ {"bzip2", no_argument, 0, 'y'}, ++ {"bzip2", no_argument, 0, 'I'}, + {"catenate", no_argument, 0, 'A'}, + {"checkpoint", no_argument, 0, CHECKPOINT_OPTION}, + {"check-links", no_argument, &check_links_option, 1}, +@@ -458,7 +460,7 @@ + control pax keywords\n\ + -V, --label=NAME create archive with volume name NAME\n\ PATTERN at list/extract time, a globbing PATTERN\n\ - -o, --old-archive, --portability write a V7 format archive\n\ - --posix write a POSIX conformant archive\n\ -+ -j, -y, -I, --bzip2, --bunzip2 filter the archive through bzip2\n\ +- -j, --bzip2 filter the archive through bzip2\n\ ++ -j, -y, -I, --bzip2 filter the archive through bzip2\n\ -z, --gzip, --ungzip filter the archive through gzip\n\ -Z, --compress, --uncompress filter the archive through compress\n\ --use-compress-program=PROG filter through PROG (must accept -d)\n"), -@@ -416,7 +422,7 @@ - Y per-block gzip compression */ - - #define OPTION_STRING \ -- "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz" -+ "-01234567ABC:F:GIK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxyz" - - static void - set_subcommand_option (enum subcommand subcommand) -@@ -787,6 +793,18 @@ - if (add_exclude_file (excluded, optarg, '\n') != 0) - FATAL_ERROR ((0, errno, "%s", optarg)); +@@ -768,13 +770,15 @@ + ignore_zeros_option = true; break; -+ + +- case 'I': +- USAGE_ERROR ((0, 0, +- _("Warning: the -I option is not supported;" +- " perhaps you meant -j or -T?"))); + case 'j': + set_use_compress_program_option ("bzip2"); -+ break; -+ + break; + +- case 'j': + case 'y': + set_use_compress_program_option ("bzip2"); -+ break; ++ break; + + case 'I': -+ set_use_compress_program_option ("bzip2"); -+ break; + set_use_compress_program_option ("bzip2"); + break; +@@ -943,12 +947,6 @@ + } + break; + +- case 'y': +- USAGE_ERROR ((0, 0, +- _("Warning: the -y option is not supported;" +- " perhaps you meant -j?"))); +- break; +- case 'z': set_use_compress_program_option ("gzip"); + break; Index: package/base/tar/read-full-records.patch =================================================================== --- package/base/tar/read-full-records.patch (revision 0) +++ package/base/tar/read-full-records.patch (revision 0) @@ -0,0 +1,11 @@ + +--- ./src/buffer.c.orig 2004-07-31 13:55:14.000000000 +0200 ++++ ./src/buffer.c 2004-07-31 13:55:48.000000000 +0200 +@@ -293,7 +293,6 @@ + { + case ACCESS_READ: + child_pid = sys_child_open_for_uncompress (); +- read_full_records_option = false; + break; + + case ACCESS_WRITE: Index: package/base/tar/no_same_owner.patch =================================================================== --- package/base/tar/no_same_owner.patch (revision 4986) +++ package/base/tar/no_same_owner.patch (working copy) @@ -1,60 +0,0 @@ -# --- 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/base/tar/no_same_owner.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at https://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/extract.c.orig Mon Jun 3 14:56:04 2002 -+++ ./src/extract.c Mon Jun 3 14:56:57 2002 -@@ -162,7 +162,7 @@ - extract as the original owner. Or else, if we are running as a user, - leave the owner and group as they are, so we extract as that user. */ - -- if (we_are_root || same_owner_option) -+ if (!no_same_owner_option && (we_are_root || same_owner_option)) - { - #if HAVE_LCHOWN - ---- ./src/common.h.orig Mon Jun 3 14:57:49 2002 -+++ ./src/common.h Mon Jun 3 15:13:56 2002 -@@ -196,6 +196,9 @@ - GLOBAL int no_recurse_option; - - /* Boolean value. */ -+GLOBAL int no_same_owner_option; -+ -+/* Boolean value. */ - GLOBAL int numeric_owner_option; - - /* Boolean value. */ ---- ./src/tar.c.orig Mon Jun 3 15:13:28 2002 -+++ ./src/tar.c Mon Jun 3 15:15:53 2002 -@@ -205,6 +205,7 @@ - {"newer-mtime", required_argument, NULL, NEWER_MTIME_OPTION}, - {"null", no_argument, NULL, NULL_OPTION}, - {"no-recursion", no_argument, NULL, NO_RECURSE_OPTION}, -+ {"no-same-owner", no_argument, &no_same_owner_option, 1}, - {"numeric-owner", no_argument, &numeric_owner_option, 1}, - {"old-archive", no_argument, NULL, 'o'}, - {"one-file-system", no_argument, NULL, 'l'}, -@@ -305,6 +306,7 @@ - --atime-preserve don't change access times on dumped files\n\ - -m, --modification-time don't extract file modified time\n\ - --same-owner try extracting files with the same ownership\n\ -+ --no-same-owner don't extract files with the same ownership\n\ - --numeric-owner always use numbers for user/group names\n\ - -p, --same-permissions extract all protection information\n\ - --preserve-permissions same as -p\n\ Index: package/base/tar/tar.conf =================================================================== --- package/base/tar/tar.conf (revision 4986) +++ package/base/tar/tar.conf (working copy) @@ -20,13 +20,10 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -# flistdel="$flistdel|usr/libexec/rmt" +var_append confopt ' ' '-C' -if [ $stagelevel -le 1 ] -then - premake="sed -i 's/gmalloc.o//' lib/Makefile" +if [ $stagelevel -gt 0 ]; then + postmake="mv -v $root/usr/bin/tar $root/bin/tar ; \ + install -m 0644 -o root -g root ${builddir}/$pkg-$ver/tar.1 $root/usr/man/man1/" fi -postmake="mv -v $root/usr/bin/tar $root/bin/tar ; \ -install -m 0644 -o root -g root ${builddir}/$pkg-$ver/tar.1 $root/usr/man/man1/" - Index: package/base/tar/no_rmt.patch =================================================================== --- package/base/tar/no_rmt.patch (revision 4986) +++ package/base/tar/no_rmt.patch (working copy) @@ -1,30 +0,0 @@ -# --- 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/base/tar/no_rmt.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at https://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/Makefile.in.orig 2003-01-07 18:04:19.000000000 +0100 -+++ ./src/Makefile.in 2003-01-07 18:04:27.000000000 +0100 -@@ -112,7 +112,7 @@ - AUTOMAKE_OPTIONS = gnits ansi2knr - bin_PROGRAMS = tar - libexec_PROGRAMS = @RMT@ --EXTRA_PROGRAMS = rmt -+EXTRA_PROGRAMS = - - noinst_HEADERS = arith.h common.h rmt.h system.h tar.h - rmt_SOURCES = rmt.c Index: package/base/mutt/mutt.desc =================================================================== --- package/base/mutt/mutt.desc (revision 4986) +++ package/base/mutt/mutt.desc (working copy) @@ -36,8 +36,8 @@ [L] GPL [S] Stable -[V] 1.4.2i +[V] 1.4.2.1i [P] X -----5---9 248.000 -[D] 3846261978 mutt-1.4.2i.tar.gz ftp://ftp.mutt.org/mutt/ +[D] 3803665787 mutt-1.4.2.1i.tar.gz ftp://ftp.mutt.org/mutt/ Index: package/base/file/file.desc =================================================================== --- package/base/file/file.desc (revision 4986) +++ package/base/file/file.desc (working copy) @@ -35,8 +35,8 @@ [L] BSD [S] Stable -[V] 4.07 +[V] 4.12 [P] X -----5---9 199.000 -[D] 1950209003 file-4.07.tar.gz ftp://ftp.astron.com/pub/file/ +[D] 839310837 file-4.12.tar.gz ftp://ftp.astron.com/pub/file/ Index: package/base/shadow/shadow.desc =================================================================== --- package/base/shadow/shadow.desc (revision 4986) +++ package/base/shadow/shadow.desc (working copy) @@ -36,8 +36,8 @@ [L] BSD [S] Stable -[V] 4.0.3 +[V] 4.0.6 [P] X ---3-5---9 711.000 -[D] 2967342955 shadow-4.0.3.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/ +[D] 0 shadow-4.0.6.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/ Index: package/base/shadow/mallocdef.patch =================================================================== --- package/base/shadow/mallocdef.patch (revision 4986) +++ package/base/shadow/mallocdef.patch (working copy) @@ -1,30 +1,14 @@ # --- 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/base/shadow/mallocdef.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at https://www.opensource.org/ (e.g. BSD, X11) or 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. -# # --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./libmisc/xmalloc.c~ Mon Dec 28 21:34:56 1998 -+++ ./libmisc/xmalloc.c Sun May 30 19:03:04 1999 -@@ -16,8 +16,6 @@ - +diff -Naur shadow-4.0.6_orig/libmisc/xmalloc.c shadow-4.0.6/libmisc/xmalloc.c +--- shadow-4.0.6_orig/libmisc/xmalloc.c 2004-05-06 23:31:33.000000000 +0200 ++++ shadow-4.0.6/libmisc/xmalloc.c 2004-12-07 19:18:44.829525033 +0100 +@@ -14,6 +14,8 @@ + #include #include "defines.h" --extern char *malloc(); -- - char * - xmalloc(size_t size) ++extern char *malloc(); ++ + char *xmalloc (size_t size) { + char *ptr; Index: package/base/shadow/libpam-fix.patch =================================================================== --- package/base/shadow/libpam-fix.patch (revision 4986) +++ package/base/shadow/libpam-fix.patch (working copy) @@ -1,33 +1,14 @@ # --- 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/base/shadow/libpam-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at https://www.opensource.org/ (e.g. BSD, X11) or 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. -# # --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/Makefile.in.orig 2003-02-08 13:51:11.000000000 +0100 -+++ ./src/Makefile.in 2003-02-08 13:51:14.000000000 +0100 -@@ -144,8 +144,10 @@ +# +--- ./src/Makefile.in.orig 2004-11-09 05:00:04.000000000 +0100 ++++ ./src/Makefile.in 2004-12-07 19:05:24.555163678 +0100 +@@ -353,7 +353,7 @@ suidbins = su suidubins = chage chfn chsh expiry gpasswd newgrp passwd - -+# Add $(LIBPAM) to $(LDADD) because libmisc and libshadow are using some -+# functions provided by the PAM library. - LDADD = $(top_builddir)/libmisc/libmisc.la \ + LDADD = $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la + $(top_builddir)/lib/libshadow.la $(LIBPAM) - chpasswd_LDADD = $(LDADD) $(LIBPAM) + chage_LDADD = $(LDADD) $(LIBPAM) Index: package/base/shadow/vigr-fix.patch =================================================================== --- package/base/shadow/vigr-fix.patch (revision 4986) +++ package/base/shadow/vigr-fix.patch (working copy) @@ -1,30 +0,0 @@ -# --- 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/base/shadow/vigr-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at https://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/Makefile.in.orig 2002-03-13 21:04:10.000000000 +0200 -+++ ./src/Makefile.in 2002-10-13 20:11:38.000000000 +0300 -@@ -799,7 +799,7 @@ - - install-exec-hook: - ln -sf newgrp $(DESTDIR)$(bindir)/sg -- ln -sf vigr $(DESTDIR)$(bindir)/vipw -+ ln -sf vipw $(DESTDIR)$(sbindir)/vigr - for i in $(suidbins); do \ - chmod 4755 $(DESTDIR)$(bindir)/$$i; \ - done Index: package/base/xfsdump/xfsdump.desc =================================================================== --- package/base/xfsdump/xfsdump.desc (revision 0) +++ package/base/xfsdump/xfsdump.desc (revision 0) @@ -0,0 +1,47 @@ +[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/hannes/xfsdump/xfsdump.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 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 https://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] backup/restore tool for xfs filesystems + +[T] xfsdump backs up files and their attributes in a filesystem. The files +[T] are dumped to storage media, a regular file, or standard output. +[T] Options allow the operator to have all files dumped, just files that +[T] have changed since a previous dump, or just files contained in a list +[T] of pathnames. +[T] The xfsrestore(8) utility re-populates a filesystem with the contents +[T] of the dump. +[T] it is optimised for use with xfs filesystems + +[U] https://oss.sgi.com/projects/xfs/ + +[A] SGI XFS development team +[M] hannes + +[C] extra/filesystem + +[L] GPL +[S] Stable +[V] 2.2.25 +[P] X -?---5---9 200.000 + +[D] 1445710355 xfsdump-2.2.25.src.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/ + Index: package/base/xfsdump/xfsdump.conf =================================================================== --- package/base/xfsdump/xfsdump.conf (revision 0) +++ package/base/xfsdump/xfsdump.conf (revision 0) @@ -0,0 +1,35 @@ +# --- 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/hannes/xfsdump/xfsdump.conf +# ROCK Linux is Copyright (C) 1998 - 2004 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 https://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + + +# only static libs go here +var_append confopt ' ' "--libexecdir='$libdir'" + +# tell xfsprogs whether we have a gettext/readline package +pkginstalled gettext || var_append confopt ' ' "--enable-gettext=no" + +bindir="$root/$prefix/sbin" +sbindir="$root/sbin" +libdir="$root/lib" + +# also install headers and libs +makeinstopt="$makeinstopt install-dev" Index: package/base/mdadm/mdadm.desc =================================================================== --- package/base/mdadm/mdadm.desc (revision 4986) +++ package/base/mdadm/mdadm.desc (working copy) @@ -34,8 +34,8 @@ [L] GPL [S] Stable -[V] 1.7.0 +[V] 1.8.1 [P] X -----5---9 800.000 -[D] 3629263738 mdadm-1.7.0.tar.bz2 https://www.de.kernel.org/pub/linux/utils/raid/mdadm/ +[D] 996089275 mdadm-1.8.1.tar.bz2 https://www.de.kernel.org/pub/linux/utils/raid/mdadm/ Index: package/base/quota/quota.desc =================================================================== --- package/base/quota/quota.desc (revision 4986) +++ package/base/quota/quota.desc (working copy) @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.10 +[V] 3.12 [P] X -----5---9 762.000 -[D] 3915463713 quota-3.10.tar.gz https://dl.sourceforge.net/sourceforge/linuxquota/ +[D] 3942742795 quota-3.12.tar.gz https://dl.sourceforge.net/sourceforge/linuxquota/ Index: package/base/disktype/disktype.desc =================================================================== --- package/base/disktype/disktype.desc (revision 4986) +++ package/base/disktype/disktype.desc (working copy) @@ -34,8 +34,8 @@ [L] OpenSource [S] Stable -[V] 6 +[V] 7 [P] X -----5---9 232.000 -[D] 497626926 disktype-6.tar.gz https://dl.sourceforge.net/sourceforge/disktype/ +[D] 1644016125 disktype-7.tar.gz https://dl.sourceforge.net/sourceforge/disktype/ Index: package/base/acl/acl.conf =================================================================== --- package/base/acl/acl.conf (revision 4986) +++ package/base/acl/acl.conf (working copy) @@ -32,6 +32,8 @@ # only static libs go here var_append confopt ' ' "--libexecdir='$libdir'" +pkginstalled gettext || var_append confopt ' ' "--enable-gettext=no" + # coreutils is built with libacl libdir="$root/lib" Index: package/base/acl/acl.desc =================================================================== --- package/base/acl/acl.desc (revision 4986) +++ package/base/acl/acl.desc (working copy) @@ -26,8 +26,6 @@ [T] POSIX Access Control Lists are used to define more fine-grained [T] discretionary access rights for files and directories. -[U] https://acl.bestbits.at/ - [A] Andreas Gruenbacher [A] SGI XFS development team [M] Clifford Wolf Index: package/base/lsof/lsof.desc =================================================================== --- package/base/lsof/lsof.desc (revision 4986) +++ package/base/lsof/lsof.desc (working copy) @@ -34,8 +34,8 @@ [L] GPL [S] Stable -[V] 4.69 +[V] 4.73 [P] X -----5---9 252.000 -[D] 1352886046 lsof_4.69.tar.gz ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/ +[D] 3490195084 lsof_4.73.tar.gz ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/ Index: package/base/less/less.desc =================================================================== --- package/base/less/less.desc (revision 4986) +++ package/base/less/less.desc (working copy) @@ -35,8 +35,8 @@ [L] GPL [S] Stable -[V] 381 +[V] 382 [P] X ---3-----9 176.000 -[D] 1078176891 less-381.tar.gz ftp://ftp.gnu.org/gnu/less/ +[D] 3251593395 less-382.tar.gz ftp://ftp.gnu.org/gnu/less/ Index: package/base/hdparm/hdparm.desc =================================================================== --- package/base/hdparm/hdparm.desc (revision 4986) +++ package/base/hdparm/hdparm.desc (working copy) @@ -33,8 +33,8 @@ [L] BSD [S] Stable -[V] 5.7 +[V] 5.8 [P] X ---3-----9 714.000 -[D] 2792639816 hdparm-5.7.tar.gz ftp://metalab.unc.edu/pub/Linux/system/hardware/ +[D] 3621425875 hdparm-5.8.tar.gz ftp://metalab.unc.edu/pub/Linux/system/hardware/