diff --git a/config/etc/bashrc b/config/etc/bashrc index 210188d7a..7768c6216 100644 --- a/config/etc/bashrc +++ b/config/etc/bashrc @@ -20,6 +20,14 @@ fi # /etc/profile. alias ls='ls --color=auto' +alias ll='ls -la' +alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde' + +# Make the shell a little bit more interactive +# to prevent the deletion of some files +alias mv='mv -i' +alias rm='rm -i' +alias cp='cp -i' # Midnight Commander isn't compatible to UTF8. # So we use it in ACSII-Mode. @@ -31,8 +39,8 @@ alias mc='mc -a' # PS1 Environment Variable for a great case study behind this script # addendum.] -#export PS1="\033[0m[\033[1;33m\u\033[1;37m@\033[1;32m\]\h \033[1;31m\w\033[0m]\\$ " -export PS1="[\u@\h \w]\\$ " +export PS1="\033[0m[\033[1;33m\u\033[1;37m@\033[1;32m\]\h \033[1;31m\w\033[0m]\\$ " +#export PS1="[\u@\h \w]\\$ " #export PS1='\u@\h:\w\$ ' # End /etc/bashrc diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 665ea216a..d59c27a82 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -13,8 +13,6 @@ usr/lib/libclamav.so.2.0.7 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav -usr/share/clamav/daily.cvd -usr/share/clamav/main.cvd #usr/share/man/man1/clamconf.1 #usr/share/man/man1/clamdscan.1 #usr/share/man/man1/clamscan.1 diff --git a/config/rootfiles/packages/openmailadmin b/config/rootfiles/packages/openmailadmin index 78b2b875f..1b7470053 100644 --- a/config/rootfiles/packages/openmailadmin +++ b/config/rootfiles/packages/openmailadmin @@ -1,9 +1,216 @@ -etc/httpd/conf/vhosts.d/openmailadmin.conf #srv/web/openmailadmin srv/web/openmailadmin/.htaccess #srv/web/openmailadmin/INSTALL srv/web/openmailadmin/LICENSE srv/web/openmailadmin/addresses.php +srv/web/openmailadmin/adodb +#srv/web/openmailadmin/adodb5 +srv/web/openmailadmin/adodb5/adodb-active-record.inc.php +srv/web/openmailadmin/adodb5/adodb-csvlib.inc.php +srv/web/openmailadmin/adodb5/adodb-datadict.inc.php +srv/web/openmailadmin/adodb5/adodb-error.inc.php +srv/web/openmailadmin/adodb5/adodb-errorhandler.inc.php +srv/web/openmailadmin/adodb5/adodb-errorpear.inc.php +srv/web/openmailadmin/adodb5/adodb-exceptions.inc.php +srv/web/openmailadmin/adodb5/adodb-iterator.inc.php +srv/web/openmailadmin/adodb5/adodb-lib.inc.php +srv/web/openmailadmin/adodb5/adodb-memcache.lib.inc.php +srv/web/openmailadmin/adodb5/adodb-pager.inc.php +srv/web/openmailadmin/adodb5/adodb-pear.inc.php +srv/web/openmailadmin/adodb5/adodb-perf.inc.php +srv/web/openmailadmin/adodb5/adodb-php4.inc.php +srv/web/openmailadmin/adodb5/adodb-time.inc.php +srv/web/openmailadmin/adodb5/adodb-xmlschema.inc.php +srv/web/openmailadmin/adodb5/adodb-xmlschema03.inc.php +srv/web/openmailadmin/adodb5/adodb.inc.php +#srv/web/openmailadmin/adodb5/contrib +srv/web/openmailadmin/adodb5/contrib/toxmlrpc.inc.php +#srv/web/openmailadmin/adodb5/cute_icons_for_site +srv/web/openmailadmin/adodb5/cute_icons_for_site/adodb.gif +srv/web/openmailadmin/adodb5/cute_icons_for_site/adodb2.gif +#srv/web/openmailadmin/adodb5/datadict +srv/web/openmailadmin/adodb5/datadict/datadict-access.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-db2.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-firebird.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-generic.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-ibase.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-informix.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-mssql.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-mysql.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-oci8.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-postgres.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-sapdb.inc.php +srv/web/openmailadmin/adodb5/datadict/datadict-sybase.inc.php +#srv/web/openmailadmin/adodb5/docs +#srv/web/openmailadmin/adodb5/docs/docs-active-record.htm +#srv/web/openmailadmin/adodb5/docs/docs-adodb.htm +#srv/web/openmailadmin/adodb5/docs/docs-datadict.htm +#srv/web/openmailadmin/adodb5/docs/docs-oracle.htm +#srv/web/openmailadmin/adodb5/docs/docs-perf.htm +#srv/web/openmailadmin/adodb5/docs/docs-session.htm +#srv/web/openmailadmin/adodb5/docs/docs-session.old.htm +#srv/web/openmailadmin/adodb5/docs/old-changelog.htm +#srv/web/openmailadmin/adodb5/docs/readme.htm +#srv/web/openmailadmin/adodb5/docs/tips_portable_sql.htm +#srv/web/openmailadmin/adodb5/docs/tute.htm +#srv/web/openmailadmin/adodb5/drivers +srv/web/openmailadmin/adodb5/drivers/adodb-access.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-ado.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-ado5.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-ado5.inc.php.bak +srv/web/openmailadmin/adodb5/drivers/adodb-ado_access.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-ado_mssql.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-borland_ibase.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-csv.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-db2.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-db2.inc.php.bak +srv/web/openmailadmin/adodb5/drivers/adodb-fbsql.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-firebird.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-ibase.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-informix.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-informix72.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-ldap.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-mssql.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-mssql_n.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-mssqlpo.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-mysql.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-mysqli.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-mysqlpo.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-mysqlt.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-netezza.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-oci8.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-oci805.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-oci8po.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-odbc.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-odbc_db2.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-odbc_mssql.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-odbc_oracle.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-odbtp.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-odbtp_unicode.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-oracle.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-pdo.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-pdo_mssql.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-pdo_mysql.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-pdo_oci.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-pdo_pgsql.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-postgres.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-postgres64.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-postgres7.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-postgres8.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-proxy.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-sapdb.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-sqlanywhere.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-sqlite.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-sqlitepo.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-sybase.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-sybase_ase.inc.php +srv/web/openmailadmin/adodb5/drivers/adodb-vfp.inc.php +#srv/web/openmailadmin/adodb5/lang +srv/web/openmailadmin/adodb5/lang/adodb-ar.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-bg.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-bgutf8.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-ca.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-cn.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-cz.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-da.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-de.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-en.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-es.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-esperanto.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-fr.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-hu.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-it.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-nl.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-pl.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-pt-br.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-ro.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-ru1251.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-sv.inc.php +srv/web/openmailadmin/adodb5/lang/adodb-uk1251.inc.php +srv/web/openmailadmin/adodb5/lang/adodb_th.inc.php +srv/web/openmailadmin/adodb5/license.txt +#srv/web/openmailadmin/adodb5/pear +srv/web/openmailadmin/adodb5/pear/Auth +srv/web/openmailadmin/adodb5/pear/Auth/Container +srv/web/openmailadmin/adodb5/pear/Auth/Container/ADOdb.php +#srv/web/openmailadmin/adodb5/pear/readme.Auth.txt +#srv/web/openmailadmin/adodb5/perf +srv/web/openmailadmin/adodb5/perf/perf-db2.inc.php +srv/web/openmailadmin/adodb5/perf/perf-informix.inc.php +srv/web/openmailadmin/adodb5/perf/perf-mssql.inc.php +srv/web/openmailadmin/adodb5/perf/perf-mysql.inc.php +srv/web/openmailadmin/adodb5/perf/perf-oci8.inc.php +srv/web/openmailadmin/adodb5/perf/perf-postgres.inc.php +srv/web/openmailadmin/adodb5/pivottable.inc.php +#srv/web/openmailadmin/adodb5/readme.txt +srv/web/openmailadmin/adodb5/rsfilter.inc.php +srv/web/openmailadmin/adodb5/server.php +#srv/web/openmailadmin/adodb5/session +srv/web/openmailadmin/adodb5/session/adodb-compress-bzip2.php +srv/web/openmailadmin/adodb5/session/adodb-compress-gzip.php +srv/web/openmailadmin/adodb5/session/adodb-cryptsession.php +srv/web/openmailadmin/adodb5/session/adodb-cryptsession2.php +srv/web/openmailadmin/adodb5/session/adodb-encrypt-mcrypt.php +srv/web/openmailadmin/adodb5/session/adodb-encrypt-md5.php +srv/web/openmailadmin/adodb5/session/adodb-encrypt-secret.php +srv/web/openmailadmin/adodb5/session/adodb-encrypt-sha1.php +srv/web/openmailadmin/adodb5/session/adodb-sess.txt +srv/web/openmailadmin/adodb5/session/adodb-session-clob.php +srv/web/openmailadmin/adodb5/session/adodb-session-clob2.php +srv/web/openmailadmin/adodb5/session/adodb-session.php +srv/web/openmailadmin/adodb5/session/adodb-session2.php +srv/web/openmailadmin/adodb5/session/adodb-sessions.mysql.sql +srv/web/openmailadmin/adodb5/session/adodb-sessions.oracle.clob.sql +srv/web/openmailadmin/adodb5/session/adodb-sessions.oracle.sql +#srv/web/openmailadmin/adodb5/session/crypt.inc.php +#srv/web/openmailadmin/adodb5/session/old +srv/web/openmailadmin/adodb5/session/old/adodb-cryptsession.php +srv/web/openmailadmin/adodb5/session/old/adodb-session-clob.php +srv/web/openmailadmin/adodb5/session/old/adodb-session.php +srv/web/openmailadmin/adodb5/session/old/crypt.inc.php +srv/web/openmailadmin/adodb5/session/session_schema.xml +srv/web/openmailadmin/adodb5/session/session_schema2.xml +#srv/web/openmailadmin/adodb5/tests +srv/web/openmailadmin/adodb5/tests/benchmark.php +srv/web/openmailadmin/adodb5/tests/client.php +srv/web/openmailadmin/adodb5/tests/pdo.php +srv/web/openmailadmin/adodb5/tests/test-active-record.php +srv/web/openmailadmin/adodb5/tests/test-active-recs2.php +srv/web/openmailadmin/adodb5/tests/test-datadict.php +srv/web/openmailadmin/adodb5/tests/test-perf.php +srv/web/openmailadmin/adodb5/tests/test-pgblob.php +srv/web/openmailadmin/adodb5/tests/test-php5.php +srv/web/openmailadmin/adodb5/tests/test-xmlschema.php +srv/web/openmailadmin/adodb5/tests/test.php +srv/web/openmailadmin/adodb5/tests/test2.php +srv/web/openmailadmin/adodb5/tests/test3.php +srv/web/openmailadmin/adodb5/tests/test4.php +srv/web/openmailadmin/adodb5/tests/test5.php +srv/web/openmailadmin/adodb5/tests/test_rs_array.php +srv/web/openmailadmin/adodb5/tests/testcache.php +srv/web/openmailadmin/adodb5/tests/testdatabases.inc.php +srv/web/openmailadmin/adodb5/tests/testgenid.php +srv/web/openmailadmin/adodb5/tests/testmssql.php +srv/web/openmailadmin/adodb5/tests/testoci8.php +srv/web/openmailadmin/adodb5/tests/testoci8cursor.php +srv/web/openmailadmin/adodb5/tests/testpaging.php +srv/web/openmailadmin/adodb5/tests/testpear.php +srv/web/openmailadmin/adodb5/tests/testsessions.php +srv/web/openmailadmin/adodb5/tests/time.php +srv/web/openmailadmin/adodb5/tests/tmssql.php +srv/web/openmailadmin/adodb5/tests/xmlschema-mssql.xml +srv/web/openmailadmin/adodb5/tests/xmlschema.xml +srv/web/openmailadmin/adodb5/toexport.inc.php +srv/web/openmailadmin/adodb5/tohtml.inc.php +srv/web/openmailadmin/adodb5/xmlschema.dtd +srv/web/openmailadmin/adodb5/xmlschema03.dtd +#srv/web/openmailadmin/adodb5/xsl +srv/web/openmailadmin/adodb5/xsl/convert-0.1-0.2.xsl +srv/web/openmailadmin/adodb5/xsl/convert-0.1-0.3.xsl +srv/web/openmailadmin/adodb5/xsl/convert-0.2-0.1.xsl +srv/web/openmailadmin/adodb5/xsl/convert-0.2-0.3.xsl +srv/web/openmailadmin/adodb5/xsl/remove-0.2.xsl +srv/web/openmailadmin/adodb5/xsl/remove-0.3.xsl #srv/web/openmailadmin/design srv/web/openmailadmin/design/exception.css srv/web/openmailadmin/design/exception.js diff --git a/lfs/clamav b/lfs/clamav index f560d7419..17b428e8d 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -82,5 +82,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install chown clamav.clamav -R /usr/share/clamav/ cp -rf $(DIR_SRC)/config/clamav/* /var/ipfire/clamav/ + rm -rfv /usr/share/clamav/*.cvd @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/rsync b/lfs/rsync index e8a08f702..f39843f24 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -24,7 +24,7 @@ include Config -VER = 2.6.8 +VER = 2.6.9 THISAPP = rsync-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 082a9dba1f741e6591e5cd748a1233de +$(DL_FILE)_MD5 = 996d8d8831dbca17910094e56dcb5942 install : $(TARGET) @@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make #cd $(DIR_APP)/doc && docbook2html rsync.sgml cd $(DIR_APP) && make install - #cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/rsync-2.6.8 && - #cd $(DIR_APP) && install -v -m644 doc/*.html /usr/share/doc/rsync-2.6.8 + #cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/rsync-$(VER) && + #cd $(DIR_APP) && install -v -m644 doc/*.html /usr/share/doc/rsync-$(VER) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 60047ba7f..406326ff2 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.0rc1" # Version number +VERSION="2.0rc2t" # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level diff --git a/src/initscripts/init.d/networking/red.up/99-pakfire-update b/src/initscripts/init.d/networking/red.up/99-pakfire-update index 2f2f980a2..067bc33cc 100644 --- a/src/initscripts/init.d/networking/red.up/99-pakfire-update +++ b/src/initscripts/init.d/networking/red.up/99-pakfire-update @@ -1,3 +1,3 @@ #!/bin/sh -/opt/pakfire/pakfire update >/dev/null 2>&1 +nice -n 10 /opt/pakfire/pakfire update >/dev/null 2>&1 & diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index 8db4f665f..c8a9b245e 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -47,9 +47,8 @@ transparent() { case "$1" in start) - boot_mesg "Starting Squid Proxy Server..." - if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then + boot_mesg "Starting Squid Proxy Server..." loadproc /usr/sbin/squid -D -z >/dev/null 2>&1 loadproc /usr/sbin/squid -D fi diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index f21748ba3..0901ce7d8 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -21,7 +21,7 @@ package Conf; -$version = "2.0rc1"; +$version = "2.0rc2t"; $mainserver = "pakfire.ipfire.org"; diff --git a/src/paks/mysql/install.sh b/src/paks/mysql/install.sh index 40787bd51..3fc601dc7 100644 --- a/src/paks/mysql/install.sh +++ b/src/paks/mysql/install.sh @@ -9,6 +9,16 @@ ln -svf ../init.d/mysql /etc/rc.d/rc6.d/K26mysql /etc/init.d/mysql start -sleep 10 +COUNTER=0 + +while [ "$COUNTER" -lt "10" ]; do + [ -e "/var/run/mysql/mysql.sock" ] && break + echo "MySQL server is still not running. Waiting 5 seconds." + sleep 5 + (( $COUNTER += 1 )) +done + +[ -e "/var/run/mysql/mysql.sock" ] || (echo "MySQL still noch running... Exiting."; \ + exit 1) mysqladmin -u root --password='' password 'mysqlfire'