IPFire-SCM February 2020

ipfire-scm@lists.ipfire.org

1 participants
46 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. aef3c56c6536474dc861e256f4816d54f9776833
by Arne Fitzenreiter 16 Feb '20

16 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via aef3c56c6536474dc861e256f4816d54f9776833 (commit) from b1a6c9f6243c3ae687fd18297848cc8e7510fbc2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit aef3c56c6536474dc861e256f4816d54f9776833 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 5 11:44:17 2020 +0000 cyrus-imapd: Drop package This package is outdated and unmaintained for many many years. I am not sure if this even works and if there are any users. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/includes/cyrus-imapd | 4 - config/cyrus-imapd/cyrus.conf | 38 - config/cyrus-imapd/imapd.conf | 26 - config/rootfiles/packages/cyrus-imapd | 215 -- lfs/cyrus-imapd | 115 -- make.sh | 1 - src/initscripts/packages/cyrus-imapd | 38 - src/paks/cyrus-imapd/install.sh | 30 - src/paks/cyrus-imapd/uninstall.sh | 29 - src/paks/cyrus-imapd/update.sh | 26 - .../cyrus-imapd-2.2.12-autocreate-0.9.4.diff | 2159 -------------------- src/patches/cyrus-imapd-2.2.12-gcc4.patch | 48 - 12 files changed, 2729 deletions(-) delete mode 100644 config/backup/includes/cyrus-imapd delete mode 100644 config/cyrus-imapd/cyrus.conf delete mode 100644 config/cyrus-imapd/imapd.conf delete mode 100644 config/rootfiles/packages/cyrus-imapd delete mode 100644 lfs/cyrus-imapd delete mode 100644 src/initscripts/packages/cyrus-imapd delete mode 100644 src/paks/cyrus-imapd/install.sh delete mode 100644 src/paks/cyrus-imapd/uninstall.sh delete mode 100644 src/paks/cyrus-imapd/update.sh delete mode 100644 src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff delete mode 100644 src/patches/cyrus-imapd-2.2.12-gcc4.patch Difference in files: diff --git a/config/backup/includes/cyrus-imapd b/config/backup/includes/cyrus-imapd deleted file mode 100644 index bb1bb3b1c..000000000 --- a/config/backup/includes/cyrus-imapd +++ /dev/null @@ -1,4 +0,0 @@ -/usr/sieve -/var/imap -/var/ipfire/cyrusimap -/var/log/imap diff --git a/config/cyrus-imapd/cyrus.conf b/config/cyrus-imapd/cyrus.conf deleted file mode 100644 index df83bd00b..000000000 --- a/config/cyrus-imapd/cyrus.conf +++ /dev/null @@ -1,38 +0,0 @@ -START { - # do not delete this entry! - recover cmd="ctl_cyrusdb -r" - - # this is only necessary if using idled for IMAP IDLE - idled cmd="idled" -} - -# UNIX sockets start with a slash and are put into /var/imap/socket -SERVICES { - # add or remove based on preferences - imap cmd="imapd" listen="imap" prefork=0 - imaps cmd="imapd -s" listen="imaps" prefork=0 - pop3 cmd="pop3d" listen="pop3" prefork=0 - pop3s cmd="pop3d -s" listen="pop3s" prefork=0 - #sieve cmd="timsieved" listen="127.0.0.1:2000" prefork=0 - - # at least one LMTP is required for delivery - #lmtp cmd="lmtpd" listen="127.0.0.1:24" prefork=0 - lmtpunix cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0 - - # this is only necessary if using notifications - notify cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1 -} - -EVENTS { - # this is required - checkpoint cmd="ctl_cyrusdb -c" period=30 - - # this is only necessary if using duplicate delivery suppression - delprune cmd="ctl_deliver -E 3" period=1440 - - # this is only necessary if caching TLS sessions - tlsprune cmd="tls_prune" period=1440 - - # SQUAT failed, helps - squatter cmd="squatter -r user" period=1440 -} diff --git a/config/cyrus-imapd/imapd.conf b/config/cyrus-imapd/imapd.conf deleted file mode 100644 index 9c7397981..000000000 --- a/config/cyrus-imapd/imapd.conf +++ /dev/null @@ -1,26 +0,0 @@ -postmaster: postmaster -configdirectory: /var/imap -partition-default: /var/log/imap -admins: cyrus -allowanonymouslogin: no -allowplaintext: yes -sasl_mech_list: PLAIN -servername: localhost -autocreatequota: 20000 -reject8bit: no -quotawarn: 90 -timeout: 30 -poptimeout: 10 -dracinterval: 0 -drachost: localhost -sasl_pwcheck_method: saslauthd -sievedir: /usr/sieve -sendmail: /usr/sbin/sendmail -sieve_maxscriptsize: 32 -sieve_maxscripts: 5 -lmtpsocket: /var/imap/socket/lmtp -unixhierarchysep: yes -#echo tls_ca_file: /var/ipfire/cyrusimap/server.pem -#echo tls_cert_file: /var/ipfire/cyrusimap/server.pem -#echo tls_key_file: /var/ipfire/cyrusimap/server.pem -#hashimapspool: yes diff --git a/config/rootfiles/packages/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd deleted file mode 100644 index 54b9e917c..000000000 --- a/config/rootfiles/packages/cyrus-imapd +++ /dev/null @@ -1,215 +0,0 @@ -etc/rc.d/init.d/cyrus-imapd -usr/bin/cyradm -usr/bin/imtest -usr/bin/installsieve -usr/bin/lmtptest -usr/bin/mkimap -usr/bin/mupdatetest -usr/bin/nntptest -usr/bin/pop3test -usr/bin/sieveshell -usr/bin/sivtest -usr/bin/smtptest -usr/bin/synctest -#usr/include/cyrus -#usr/include/cyrus/acl.h -#usr/include/cyrus/arrayu64.h -#usr/include/cyrus/assert.h -#usr/include/cyrus/auth.h -#usr/include/cyrus/auth_pts.h -#usr/include/cyrus/bitvector.h -#usr/include/cyrus/bsearch.h -#usr/include/cyrus/charset.h -#usr/include/cyrus/chartable.h -#usr/include/cyrus/command.h -#usr/include/cyrus/crc32.h -#usr/include/cyrus/cyr_lock.h -#usr/include/cyrus/cyrusdb.h -#usr/include/cyrus/exitcodes.h -#usr/include/cyrus/glob.h -#usr/include/cyrus/gmtoff.h -#usr/include/cyrus/hash.h -#usr/include/cyrus/hashu64.h -#usr/include/cyrus/imapopts.h -#usr/include/cyrus/imapurl.h -#usr/include/cyrus/imclient.h -#usr/include/cyrus/imparse.h -#usr/include/cyrus/iostat.h -#usr/include/cyrus/iptostring.h -#usr/include/cyrus/libcyr_cfg.h -#usr/include/cyrus/lsort.h -#usr/include/cyrus/map.h -#usr/include/cyrus/mappedfile.h -#usr/include/cyrus/mkgmtime.h -#usr/include/cyrus/mpool.h -#usr/include/cyrus/nonblock.h -#usr/include/cyrus/parseaddr.h -#usr/include/cyrus/retry.h -#usr/include/cyrus/rfc822tok.h -#usr/include/cyrus/sieve -#usr/include/cyrus/sieve/sieve_err.h -#usr/include/cyrus/sieve/sieve_interface.h -#usr/include/cyrus/signals.h -#usr/include/cyrus/strarray.h -#usr/include/cyrus/strhash.h -#usr/include/cyrus/stristr.h -#usr/include/cyrus/sysexits.h -#usr/include/cyrus/times.h -#usr/include/cyrus/tok.h -#usr/include/cyrus/vparse.h -#usr/include/cyrus/wildmat.h -#usr/include/cyrus/xmalloc.h -#usr/lib/cyrus -usr/lib/cyrus/arbitron -usr/lib/cyrus/chk_cyrus -usr/lib/cyrus/ctl_cyrusdb -usr/lib/cyrus/ctl_deliver -usr/lib/cyrus/ctl_mboxlist -usr/lib/cyrus/cvt_cyrusdb -usr/lib/cyrus/cyr_dbtool -usr/lib/cyrus/cyr_deny -usr/lib/cyrus/cyr_df -usr/lib/cyrus/cyr_expire -usr/lib/cyrus/cyr_info -usr/lib/cyrus/cyr_sequence -usr/lib/cyrus/cyr_synclog -usr/lib/cyrus/cyr_userseen -usr/lib/cyrus/cyrdump -usr/lib/cyrus/deliver -usr/lib/cyrus/fud -usr/lib/cyrus/idled -usr/lib/cyrus/imapd -usr/lib/cyrus/ipurge -usr/lib/cyrus/lmtpd -usr/lib/cyrus/lmtpproxyd -usr/lib/cyrus/master -usr/lib/cyrus/mbexamine -usr/lib/cyrus/mbpath -usr/lib/cyrus/mbtool -usr/lib/cyrus/notifyd -usr/lib/cyrus/pop3d -usr/lib/cyrus/pop3proxyd -usr/lib/cyrus/proxyd -usr/lib/cyrus/quota -usr/lib/cyrus/reconstruct -usr/lib/cyrus/sievec -usr/lib/cyrus/sieved -usr/lib/cyrus/smmapd -usr/lib/cyrus/squatter -usr/lib/cyrus/timsieved -usr/lib/cyrus/tls_prune -usr/lib/cyrus/unexpunge -#usr/lib/libcyrus.la -#usr/lib/libcyrus.so -usr/lib/libcyrus.so.0 -usr/lib/libcyrus.so.0.0.0 -#usr/lib/libcyrus_imap.la -#usr/lib/libcyrus_imap.so -usr/lib/libcyrus_imap.so.0 -usr/lib/libcyrus_imap.so.0.0.0 -#usr/lib/libcyrus_min.la -#usr/lib/libcyrus_min.so -usr/lib/libcyrus_min.so.0 -usr/lib/libcyrus_min.so.0.0.0 -#usr/lib/libcyrus_sieve.la -#usr/lib/libcyrus_sieve.so -usr/lib/libcyrus_sieve.so.0 -usr/lib/libcyrus_sieve.so.0.0.0 -#usr/lib/perl5/site_perl/5.30.0/Cyrus -#usr/lib/perl5/site_perl/5.30.0/Cyrus/Annotator -usr/lib/perl5/site_perl/5.30.0/Cyrus/Annotator/Daemon.pm -usr/lib/perl5/site_perl/5.30.0/Cyrus/Annotator/Message.pm -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/IMAP -usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/IMAP.pm -usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/IMAP/Admin.pm -usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/IMAP/IMSP.pm -usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/IMAP/Shell.pm -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/SIEVE -usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Cyrus/SIEVE/managesieve.pm -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/Annotator -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/Annotator/Daemon -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/Annotator/Daemon/.packlist -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/IMAP -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/.packlist -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/IMAP.bs -usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/IMAP.so -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.bs -usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so -#usr/lib/pkgconfig/libcyrus.pc -#usr/lib/pkgconfig/libcyrus_min.pc -#usr/lib/pkgconfig/libcyrus_sieve.pc -#usr/share/man/man1/cyradm.1 -#usr/share/man/man1/imtest.1 -#usr/share/man/man1/installsieve.1 -#usr/share/man/man1/lmtptest.1 -#usr/share/man/man1/mupdatetest.1 -#usr/share/man/man1/nntptest.1 -#usr/share/man/man1/pop3test.1 -#usr/share/man/man1/sieveshell.1 -#usr/share/man/man1/sivtest.1 -#usr/share/man/man1/smtptest.1 -#usr/share/man/man3/Cyrus::Annotator::Daemon.3 -#usr/share/man/man3/Cyrus::Annotator::Message.3 -#usr/share/man/man3/Cyrus::IMAP.3 -#usr/share/man/man3/Cyrus::IMAP::Admin.3 -#usr/share/man/man3/Cyrus::IMAP::IMSP.3 -#usr/share/man/man3/Cyrus::IMAP::Shell.3 -#usr/share/man/man3/Cyrus::SIEVE::managesieve.3 -#usr/share/man/man3/imclient.3 -#usr/share/man/man5/cyrus.conf.5 -#usr/share/man/man5/imapd.conf.5 -#usr/share/man/man5/krb.equiv.5 -#usr/share/man/man8/arbitron.8 -#usr/share/man/man8/chk_cyrus.8 -#usr/share/man/man8/ctl_cyrusdb.8 -#usr/share/man/man8/ctl_deliver.8 -#usr/share/man/man8/ctl_mboxlist.8 -#usr/share/man/man8/cvt_cyrusdb.8 -#usr/share/man/man8/cyr_dbtool.8 -#usr/share/man/man8/cyr_deny.8 -#usr/share/man/man8/cyr_df.8 -#usr/share/man/man8/cyr_expire.8 -#usr/share/man/man8/cyr_info.8 -#usr/share/man/man8/cyr_synclog.8 -#usr/share/man/man8/deliver.8 -#usr/share/man/man8/fud.8 -#usr/share/man/man8/idled.8 -#usr/share/man/man8/imapd.8 -#usr/share/man/man8/ipurge.8 -#usr/share/man/man8/lmtpd.8 -#usr/share/man/man8/mbexamine.8 -#usr/share/man/man8/mbpath.8 -#usr/share/man/man8/notifyd.8 -#usr/share/man/man8/pop3d.8 -#usr/share/man/man8/quota.8 -#usr/share/man/man8/reconstruct.8 -#usr/share/man/man8/rmnews.8 -#usr/share/man/man8/smmapd.8 -#usr/share/man/man8/squatter.8 -#usr/share/man/man8/sync_client.8 -#usr/share/man/man8/sync_reset.8 -#usr/share/man/man8/sync_server.8 -#usr/share/man/man8/timsieved.8 -#usr/share/man/man8/tls_prune.8 -#usr/share/man/man8/unexpunge.8 -usr/sieve -var/imap -var/imap/db -var/imap/log -var/imap/msg -var/imap/proc -var/imap/ptclient -var/imap/socket -var/imap/sync -var/ipfire/backup/addons/includes/cyrus-imapd -var/ipfire/cyrusimap -var/ipfire/cyrusimap/cyrus.conf -var/ipfire/cyrusimap/imapd.conf -var/log/imap -var/log/imap/stage. -var/log/imap/sync. diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd deleted file mode 100644 index 18b41ac7d..000000000 --- a/lfs/cyrus-imapd +++ /dev/null @@ -1,115 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.5.11 - -THISAPP = cyrus-imapd-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = cyrus-imapd -PAK_VER = 8 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 674083444c36a786d9431b6612969224 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --with-service-path=/usr/lib/cyrus \ - --with-cyrus-prefix=/usr/lib/cyrus \ - --sysconfdir=/var/ipfire/cyrusimap \ - --with-perl \ - --with-sasl \ - --with-syslogfacility=MAIL \ - --without-snmp \ - --enable-autocreate \ - --enable-idled - - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - -mkdir /var/imap - chown cyrus:mail /var/imap - chmod 755 /var/imap - -mkdir /var/log/imap - chown cyrus:mail /var/log/imap - chmod 750 /var/log/imap - -mkdir /usr/sieve - chown cyrus:mail /usr/sieve - chmod 750 /usr/sieve - -mkdir /var/ipfire/cyrusimap - cp -f $(DIR_SRC)/config/cyrus-imapd/* /var/ipfire/cyrusimap - cp -f $(DIR_APP)/tools/mkimap /usr/bin - sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf - chown cyrus.mail /var/imap/socket - install -v -m 644 $(DIR_SRC)/config/backup/includes/cyrus-imapd \ - /var/ipfire/backup/addons/includes/cyrus-imapd - - #install initscripts - $(call INSTALL_INITSCRIPT,cyrus-imapd) - - @rm -rf $(DIR_APP) /usr/include/com_err.h - @$(POSTBUILD) diff --git a/make.sh b/make.sh index ce5822736..2e396fd8e 100755 --- a/make.sh +++ b/make.sh @@ -1408,7 +1408,6 @@ buildipfire() { lfsmake2 chkconfig lfsmake2 postfix lfsmake2 fetchmail - lfsmake2 cyrus-imapd lfsmake2 clamav lfsmake2 perl-NetAddr-IP lfsmake2 spamassassin diff --git a/src/initscripts/packages/cyrus-imapd b/src/initscripts/packages/cyrus-imapd deleted file mode 100644 index 2f849c8a8..000000000 --- a/src/initscripts/packages/cyrus-imapd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Begin $rc_base/init.d/cyrus-imapd - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org - -. /etc/sysconfig/rc -. $rc_functions - -case "$1" in - start) - boot_mesg "Starting the Cyrus IMAP Server..." - /usr/lib/cyrus/master & - evaluate_retval - ;; - - stop) - boot_mesg "Stopping the Cyrus IMAP Server..." - killproc /usr/lib/cyrus/master - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc /usr/lib/cyrus/master - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/cyrus-imapd diff --git a/src/paks/cyrus-imapd/install.sh b/src/paks/cyrus-imapd/install.sh deleted file mode 100644 index a23153b7d..000000000 --- a/src/paks/cyrus-imapd/install.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} -start_service ${NAME} -ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc0.d/K23cyrus-imapd -ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc3.d/S37cyrus-imapd -ln -sf ../init.d/cyrus-imapd /etc/rc.d/rc6.d/K23cyrus-imapd diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh deleted file mode 100644 index e34fa5698..000000000 --- a/src/paks/cyrus-imapd/uninstall.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_backup_includes -stop_service ${NAME} -make_backup ${NAME} -remove_files -rm -rfv /etc/rc.d/rc*.d/*cyrus-imapd diff --git a/src/paks/cyrus-imapd/update.sh b/src/paks/cyrus-imapd/update.sh deleted file mode 100644 index 89c40d0d7..000000000 --- a/src/paks/cyrus-imapd/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff b/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff deleted file mode 100644 index cb4c6c994..000000000 --- a/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff +++ /dev/null @@ -1,2159 +0,0 @@ -diff -Naur cyrus-imapd-2.2.12/README.autocreate cyrus-imapd-2.2.12.autocreate2/README.autocreate ---- cyrus-imapd-2.2.12/README.autocreate 1970-01-01 02:00:00.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/README.autocreate 2005-10-19 14:48:57.930991000 +0300 -@@ -0,0 +1,181 @@ -+Cyrus IMAP autocreate Inbox patch -+---------------------------------- -+ -+NOTE : This patch has been created at the University of Athens. For more info, as well -+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr -+ -+The design of Cyrus IMAP server does not predict the automatic creation of users' -+INBOX folders. The creation of a user's INBOX is considered to be an external task, -+that has to be completed as part of the user e-mail account creation procedure. -+Hence, to create a new e-mail account the site administrator has to -+a) Include the new account in the user database for the authentication procedure -+ (e.g. sasldb, shadow, mysql, ldap). -+b) Create the corresponding INBOX folder. -+ -+Alternatively, the user, if succesfully authenticated, may create his own INBOX folder, -+as long as the configuration of the site allows it (see "autocreatequota" in imapd.conf). -+Unlike what uncareful readers may think, enabling the "autocreatequota" option, doesn't -+lead to the automatic INBOX folder creation by Cyrus IMAP server. -+In fact, "autocreate" means that the IMAP clients are allowed to automatically create -+the user INBOX. -+ -+This patch adds the functionality of automatic creation of the users' INBOX folders into -+the Cyrus IMAP server. It is implemented as two features, namely the "create on login" -+and "create on post". -+ -+ -+ -+Create on login -+=============== -+This feauture provides automatic creation of a user's INBOX folder when all of the -+following requirements are met: -+ -+i) The user has succesfully passed the authentication procedure. -+ -+ii) The user's authorization ID (typically the same as the user's -+authentication ID) doesn't belong to the imap_admins or admins -+accounts (see imapd.conf). -+ -+iii) The "autocreatequota" option in the imap configuration file -+has been set to a non zero value. -+ -+iv) The corresponding to the user's authorizationID INBOX folder -+does not exist. -+ -+The user's first login is the most typical case when all four requirements are met. -+Note that if the authenticatedID is allowed to proxy to another account for which -+all of the above requirements are met, the corresponding INBOX folder for that account -+will be created. -+ -+ -+ -+Create on post -+============== -+This feauture provides automatic creation of a user's INBOX folder when all of the -+following requirements are met. -+ -+i) An e-mail message addressed to the user has been received. -+ -+ii) The recipient is not any of the imap_admins or admins accounts. -+Note that passing e-mails to admins or imap_admins accounts from -+the MTA to LMTP should be avoided in any case. -+ -+iii) The recipient's INBOX does not exist. -+ -+iv) The "autocreatequota" option in the imap configuration file -+has been set to a non zero value. -+ -+v) The "createonpost" option in the imap configuration file -+has been switched on. -+ -+ -+Besides the automatic creation of INBOX folder, additional functionalities are -+provided: -+ -+A) Automatic creation of INBOX subfolders controlled by "autocreateinboxfolders" -+configuration option. eg -+ -+autocreateinboxfolders: sent|drafts|spam|templates -+ -+B) Automatic subscription of INBOX subfolders controlled by "autosubscribeinboxfolders" -+configuration option. eg -+ -+autosubscribeinboxfolders: sent|spam -+ -+Obviously, only subscription to subfolders included in the "autocreateinboxfolder" -+list is meaningfull. -+ -+C) Automatic subscription to shared folders (bulletin boards). The user gets -+automatically subscribed to the shared folders declared in the "autosubscribesharedfolders" -+configuration option in imapd.conf. -+eg autosubscribesharedfolders: public_folder | public_folder.subfolder -+ -+In order the above action to succeed, the shared folder has to pre-exist the INBOX creation -+and the user must have the apropriate permissions in order to be able to subscribe to the -+shared folder. -+ -+* A new config option has been added. 'autosubscribe_all_sharedfolders' is a yes/no -+option. When set to yes, the user is automatically subscribed to all shared folders one -+has permission to subscribe to. Please, note that when this option is set to yes, then -+'autosubscribesharedfolders' option is overriden. -+ -+D) Automatic creation of a predefined default sieve script. -+ -+This is very useful when a default sieve script is used for every user. Usually, a -+default anti-spam script may me be written in a file and copied to each user -+sieve scripts upon the INBOX creation. The imapd.conf options that have been added -+are 'autocreate_sieve_script', 'autocreate_sieve_compiledscript' and -+'generate_compiled_sieve_script'. -+ -+autocreate_sieve_script configuration option refers to the full path of the file -+that contains the sieve script. The default value is null and if no file is defined, -+then no default script is created upon INBOX creation. (The feature is disabled) -+eg autocreate_sieve_script: /etc/default_sieve_script -+ -+autocreate_sieve_compiledscript configuration option refers to the full path of the -+file that contains the bytecode compiled sieve script. If this filename is defined -+in imapd.conf and the file exists, then it is automatically copied in the user's sieve -+directory. If it is not defined, then a bytecode sieve script gets on the fly compiled -+by the daemon. -+eg autocreate_sieve_compiledscript: /etc/default_sieve_script.bc -+ -+generate_compiled_sieve_script is a boolean option that triggers the compilation of the -+source sieve script to bytecode sieve script. The file that the bytecode script will -+be saved is pointed by autocreate_sieve_compiledscript. -+ -+Ways of compiling a sieve script : -+1. Compile a sieve script using the standard sievec utility, distributed by CMU -+2. Compile a sieve script using the compile_sieve utility, released by UoA. This -+ tool is almost identical to the sievec utility, with the difference that it -+ reads the input and output file from autocreate_sieve_script and -+ autocreate_sieve_compiledscript options in imapd.conf -+3. Let cyrus create a compiled sieve script using a source script. Cyrus can be -+ instructed to save the compiled script any time a compiled script does not exist. -+ -+NOTES : -+1. In order this functionality to work, the following requirements must have been met: -+ - 'sieveusehomedir' option must be 'no' in the configuration (default). -+ - 'sievedir' option must have a valid value. -+2. Currently, this patch checks the validity of the source script while generating a -+ bytecode compiled script, but not the validity of the bytecode sieve script file. -+ The administrator should make sure that the provided files contain a valid sieve -+ script as well as the compiled script is updated every time the source script changes. -+ -+ -+ -+Issues to be considered -+======================= -+ -+I) In order to use the create on post feauture one should be absolutely sure that: -+a) The MTA checks the validity of the e-mail recipient before sending the e-mail to -+LMTP. This is an RFC821 requirement. This usually expands to "the mta should be -+able to use the account database as user mailbox database". -+b) Only authorized accounts/services can talk to LMTP. -+ -+II) Especially in the case of imap logins, the current patch implementation checks -+for the INBOX folder existence upon login, causing an extra mailbox lookup in most -+of the cases. -+A better approach would be to chase the "IMAP_MAILBOX_NONEXISTENT" error code and -+check if the error is associated with an INBOX folder. However, this would mess up -+Cyrus code. The way it was implemented may not have been the most performance -+optimized, but it produces a much cleaner and simple patch. -+ -+ -+ -+Virtual Domains Support -+======================= -+ -+Virtual domains are supported by all versions of the patch for cyrus-imapd-2.2.1-BETA and -+later. However, it is not possible to declare different INBOX subfolders to be created or -+shared folders to be subscribed to for every domain. -+ -+ -+ -+Things to be done -+================= -+ -+1. Support MURDER architecture. -+ -+ -+For more information and updates please visit http://email.uoa.gr/autocreate -+ -diff -Naur cyrus-imapd-2.2.12/imap/Makefile.in cyrus-imapd-2.2.12.autocreate2/imap/Makefile.in ---- cyrus-imapd-2.2.12/imap/Makefile.in 2004-05-28 21:03:02.000000000 +0300 -+++ cyrus-imapd-2.2.12.autocreate2/imap/Makefile.in 2005-10-19 14:48:57.935240000 +0300 -@@ -104,7 +104,7 @@ - convert_code.o duplicate.o saslclient.o saslserver.o signals.o \ - annotate.o search_engines.o squat.o squat_internal.o mbdump.o \ - imapparse.o telemetry.o user.o notify.o protocol.o quota_db.o \ -- $(SEEN) $(IDLE) -+ autosieve.o $(SEEN) $(IDLE) - - IMAPDOBJS=pushstats.o backend.o imapd.o index.o tls.o version.o - -@@ -122,7 +122,7 @@ - fud smmapd reconstruct quota mbpath ipurge \ - cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \ - ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \ -- @IMAP_PROGS@ -+ compile_sieve @IMAP_PROGS@ - - BUILTSOURCES = imap_err.c imap_err.h pushstats.c pushstats.h \ - lmtpstats.c lmtpstats.h xversion.h mupdate_err.c mupdate_err.h \ -@@ -188,7 +188,7 @@ - ### Services - idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o idled \ -- idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) -+ idled.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - - lmtpd: lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) \ - $(DEPLIBS) $(SERVICE) -@@ -214,10 +214,10 @@ - $(SERVICE) lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \ - libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) -+imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o imapd \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ -- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \ -@@ -232,7 +232,7 @@ - proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o proxyd \ - $(SERVICE) $(PROXYDOBJS) mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - proxyd.pure: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o proxyd.pure \ -@@ -244,7 +244,7 @@ - $(CC) $(LDFLAGS) -o mupdate \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ - mutex_pthread.o tls.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread - - mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ - libimap.a $(DEPLIBS) -@@ -252,92 +252,96 @@ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ - mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread - --pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) -+pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \ -- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \ - mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o nntpd nntpd.o backend.o index.o spool.o \ - smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \ -- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) -+fud: fud.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - --smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) -+smmapd: smmapd.o libimap.a mutex_fake.o $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - ### Command Line Utilities --arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS) -+arbitron: arbitron.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) -+ -+compile_sieve: compile_sieve.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) -+ $(CC) $(LDFLAGS) -o compile_sieve compile_sieve.o $(CLIOBJS) \ -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS) -+cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS) -+chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --deliver: deliver.o backend.o $(LMTPOBJS) mutex_fake.o libimap.a $(DEPLIBS) -+deliver: deliver.o backend.o $(LMTPOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o deliver deliver.o backend.o $(LMTPOBJS) \ -- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) -+ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ ctl_deliver.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS) -+cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) -+fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ fetchnews.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS) -+squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ -- $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS) -+mbpath: mbpath.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ -- $(DEPLIBS) $(LIBS) -+ $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS) -+ipurge: ipurge.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) -+cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) -+mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ mbexamine mbexamine.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) -+reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ reconstruct reconstruct.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS) -+quota: quota.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ -- libimap.a $(DEPLIBS) $(LIBS) -+ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - --tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) -+tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -- $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) -+ $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) - - ### Other Misc Targets - -diff -Naur cyrus-imapd-2.2.12/imap/autosieve.c cyrus-imapd-2.2.12.autocreate2/imap/autosieve.c ---- cyrus-imapd-2.2.12/imap/autosieve.c 1970-01-01 02:00:00.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/imap/autosieve.c 2005-10-19 14:48:57.940098000 +0300 -@@ -0,0 +1,587 @@ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+ -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ -+#include <errno.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <sys/uio.h> -+#include <fcntl.h> -+#include <ctype.h> -+#include <time.h> -+#include <syslog.h> -+#include <com_err.h> -+#include <config.h> -+ -+#include "global.h" -+#include "util.h" -+#include "mailbox.h" -+#include "imap_err.h" -+#include "sieve_interface.h" -+#include "script.h" -+ -+#define TIMSIEVE_FAIL -1 -+#define TIMSIEVE_OK 0 -+#define MAX_FILENAME 1024 -+ -+static int get_script_name(char *sievename, size_t buflen, const char *filename); -+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir); -+int autoadd_sieve(char *userid, const char *source_script); -+ -+static void fatal(const char *s, int code); -+static void foo(void); -+static int sieve_notify(void *ac __attribute__((unused)), -+ void *interp_context __attribute__((unused)), -+ void *script_context __attribute__((unused)), -+ void *message_context __attribute__((unused)), -+ const char **errmsg __attribute__((unused))); -+static int mysieve_error(int lineno, const char *msg, -+ void *i __attribute__((unused)), void *s); -+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); -+ -+ -+sieve_vacation_t vacation2 = { -+ 0, /* min response */ -+ 0, /* max response */ -+ (sieve_callback *) &foo, /* autorespond() */ -+ (sieve_callback *) &foo /* send_response() */ -+}; -+ -+ -+/* -+ * Find the name of the sieve script -+ * given the source script and compiled script names -+ */ -+static int get_script_name(char *sievename, size_t buflen, const char *filename) -+{ -+ char *p; -+ int r; -+ -+ p = strrchr(filename, '/'); -+ if (p == NULL) -+ p = (char *) filename; -+ else -+ p++; -+ -+ r = strlcpy(sievename, p, buflen) - buflen; -+ return (r >= 0 || r == -buflen ? 1 : 0); -+} -+ -+ -+/* -+ * Find the directory where the sieve scripts of the user -+ * reside -+ */ -+static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir) -+{ -+ char *user = NULL, *domain = NULL; -+ -+ /* Setup the user and the domain */ -+ if(config_virtdomains && (domain = strchr(userid, '@'))) { -+ user = (char *) xmalloc((domain - userid +1) * sizeof(char)); -+ strlcpy(user, userid, domain - userid + 1); -+ domain++; -+ } else -+ user = userid; -+ -+ /* Find the dir path where the sieve scripts of the user will reside */ -+ if (config_virtdomains && domain) { -+ if(snprintf(sieve_script_dir, buflen, "%s%s%c/%s/%c/%s/", -+ sieve_dir, FNAME_DOMAINDIR, dir_hash_c(domain), domain, dir_hash_c(user), user) >= buflen) { -+ free(user); -+ return 1; -+ } -+ } else { -+ if(snprintf(sieve_script_dir, buflen, "%s/%c/%s/", -+ sieve_dir, dir_hash_c(user), user) >= buflen) -+ return 1; -+ } -+ -+ /* Free the xmalloced user memory, reserved above */ -+ if(user != userid) -+ free(user); -+ -+ return 0; -+} -+ -+int autoadd_sieve(char *userid, const char *source_script) -+{ -+ sieve_script_t *s = NULL; -+ bytecode_info_t *bc = NULL; -+ char *err = NULL; -+ FILE *in_stream, *out_fp; -+ int out_fd, in_fd, r, k; -+ int do_compile = 0; -+ const char *sieve_dir = NULL; -+ const char *compiled_source_script = NULL; -+ char sievename[MAX_FILENAME]; -+ char sieve_script_name[MAX_FILENAME]; -+ char sieve_script_dir[MAX_FILENAME]; -+ char sieve_bcscript_name[MAX_FILENAME]; -+ char sieve_default[MAX_FILENAME]; -+ char sieve_tmpname[MAX_FILENAME]; -+ char sieve_bctmpname[MAX_FILENAME]; -+ char sieve_bclink_name[MAX_FILENAME]; -+ char buf[4096]; -+ mode_t oldmask; -+ struct stat statbuf; -+ -+ /* We don't support using the homedirectory, like timsieved */ -+ if (config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR)) { -+ syslog(LOG_WARNING,"autocreate_sieve: autocreate_sieve does not work with sieveusehomedir option in imapd.conf"); -+ return 1; -+ } -+ -+ /* Check if sievedir is defined in imapd.conf */ -+ if(!(sieve_dir = config_getstring(IMAPOPT_SIEVEDIR))) { -+ syslog(LOG_WARNING, "autocreate_sieve: sievedir option is not defined. Check imapd.conf"); -+ return 1; -+ } -+ -+ /* Check if autocreate_sieve_compiledscript is defined in imapd.conf */ -+ if(!(compiled_source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) { -+ syslog(LOG_WARNING, "autocreate_sieve: autocreate_sieve_compiledscript option is not defined. Compiling it"); -+ do_compile = 1; -+ } -+ -+ if(get_script_dir(sieve_script_dir, sizeof(sieve_script_dir), userid, sieve_dir)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Cannot find sieve scripts directory"); -+ return 1; -+ } -+ -+ if (get_script_name(sievename, sizeof(sievename), source_script)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve script %s", source_script); -+ return 1; -+ } -+ -+ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s%s.script.NEW",sieve_script_dir, sievename) >= sizeof(sieve_tmpname)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_bctmpname, sizeof(sieve_bctmpname), "%s%s.bc.NEW",sieve_script_dir, sievename) >= sizeof(sieve_bctmpname)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_script_name, sizeof(sieve_script_name), "%s%s.script",sieve_script_dir, sievename) >= sizeof(sieve_script_name)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_bcscript_name, sizeof(sieve_bcscript_name), "%s%s.bc",sieve_script_dir, sievename) >= sizeof(sieve_bcscript_name)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_default, sizeof(sieve_default), "%s%s",sieve_script_dir,"defaultbc") >= sizeof(sieve_default)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ if(snprintf(sieve_bclink_name, sizeof(sieve_bclink_name), "%s.bc", sievename) >= sizeof(sieve_bclink_name)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Invalid sieve path %s, %s, %s", sieve_dir, sievename, userid); -+ return 1; -+ } -+ -+ /* Check if a default sieve filter alrady exists */ -+ if(!stat(sieve_default,&statbuf)) { -+ syslog(LOG_WARNING,"autocreate_sieve: Default sieve script already exists"); -+ fclose(in_stream); -+ return 1; -+ } -+ -+ /* Open the source script. if there is a problem with that exit */ -+ in_stream = fopen(source_script, "r"); -+ if(!in_stream) { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to open sieve script %s. Check permissions",source_script); -+ return 1; -+ } -+ -+ -+ /* -+ * At this point we start the modifications of the filesystem -+ */ -+ -+ /* Create the directory where the sieve scripts will reside */ -+ r = cyrus_mkdir(sieve_script_dir, 0755); -+ if(r == -1) { -+ /* If this fails we just leave */ -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create directory %s. Check permissions",sieve_script_name); -+ return 1; -+ } -+ -+ /* -+ * We open the file that will be used as the bc file. If this file exists, overwrite it -+ * since something bad has happened. We open the file here so that this error checking is -+ * done before we try to open the rest of the files to start copying etc. -+ */ -+ out_fd = open(sieve_bctmpname, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); -+ if(out_fd < 0) { -+ if(errno == EEXIST) { -+ syslog(LOG_WARNING,"autocreate_sieve: File %s already exists. Probaly left over. Ignoring",sieve_bctmpname); -+ } else if (errno == EACCES) { -+ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } else { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s. Unknown error",sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } -+ } -+ -+ if(!do_compile && compiled_source_script && (in_fd = open(compiled_source_script, O_RDONLY)) != -1) { -+ while((r = read(in_fd, buf, sizeof(buf))) > 0) { -+ if((k=write(out_fd, buf,r)) < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_bctmpname, errno); -+ close(out_fd); -+ close(in_fd); -+ fclose(in_stream); -+ unlink(sieve_bctmpname); -+ return 1; -+ } -+ } -+ -+ if(r == 0) { /* EOF */ -+ close(out_fd); -+ close(in_fd); -+ } else if (r < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error reading compiled script file: %s. Will try to compile it", -+ compiled_source_script); -+ close(in_fd); -+ do_compile = 1; -+ if(lseek(out_fd, 0, SEEK_SET)) { -+ syslog(LOG_WARNING, "autocreate_sieve: Major IO problem. Aborting"); -+ return 1; -+ } -+ } -+ close(in_fd); -+ } else { -+ if(compiled_source_script) -+ syslog(LOG_WARNING,"autocreate_sieve: Problem opening compiled script file: %s. Compiling it", compiled_source_script); -+ do_compile = 1; -+ } -+ -+ -+ /* Because we failed to open a precompiled bc sieve script, we compile one */ -+ if(do_compile) { -+ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) { -+ if(err && *err) { -+ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script %s.",err); -+ free(err); -+ } else -+ syslog(LOG_WARNING,"autocreate_sieve: Error while parsing script"); -+ -+ unlink(sieve_bctmpname); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ /* generate the bytecode */ -+ if(sieve_generate_bytecode(&bc, s) == TIMSIEVE_FAIL) { -+ syslog(LOG_WARNING,"autocreate_sieve: problem compiling sieve script"); -+ /* removing the copied script and cleaning up memory */ -+ unlink(sieve_bctmpname); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ if(sieve_emit_bytecode(out_fd, bc) == TIMSIEVE_FAIL) { -+ syslog(LOG_WARNING,"autocreate_sieve: problem emiting sieve script"); -+ /* removing the copied script and cleaning up memory */ -+ unlink(sieve_bctmpname); -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return 1; -+ } -+ -+ /* clean up the memory */ -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ } -+ -+ close(out_fd); -+ rewind(in_stream); -+ -+ /* Copy the initial script */ -+ oldmask = umask(077); -+ if((out_fp = fopen(sieve_tmpname, "w")) == NULL) { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to open %s destination sieve script", sieve_tmpname); -+ unlink(sieve_bctmpname); -+ umask(oldmask); -+ fclose(in_stream); -+ return 1; -+ } -+ umask(oldmask); -+ -+ while((r = fread(buf,sizeof(char), sizeof(buf), in_stream))) { -+ if( fwrite(buf,sizeof(char), r, out_fp) != r) { -+ syslog(LOG_WARNING,"autocreate_sieve: Problem writing to sieve script file: %s",sieve_tmpname); -+ fclose(out_fp); -+ unlink(sieve_tmpname); -+ unlink(sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } -+ } -+ -+ if(feof(in_stream)) { -+ fclose(out_fp); -+ } else { /* ferror */ -+ fclose(out_fp); -+ unlink(sieve_tmpname); -+ unlink(sieve_bctmpname); -+ fclose(in_stream); -+ return 1; -+ } -+ -+ /* Renaming the necessary stuff */ -+ if(rename(sieve_tmpname, sieve_script_name)) { -+ unlink(sieve_tmpname); -+ unlink(sieve_bctmpname); -+ return 1; -+ } -+ -+ if(rename(sieve_bctmpname, sieve_bcscript_name)) { -+ unlink(sieve_bctmpname); -+ unlink(sieve_bcscript_name); -+ return 1; -+ } -+ -+ /* end now with the symlink */ -+ if(symlink(sieve_bclink_name, sieve_default)) { -+ if(errno != EEXIST) { -+ syslog(LOG_WARNING, "autocreate_sieve: problem making the default link."); -+ /* Lets delete the files */ -+ unlink(sieve_script_name); -+ unlink(sieve_bcscript_name); -+ } -+ } -+ -+ /* -+ * If everything has succeeded AND we have compiled the script AND we have requested -+ * to generate the global script so that it is not compiled each time then we create it. -+ */ -+ if(do_compile && -+ config_getswitch(IMAPOPT_GENERATE_COMPILED_SIEVE_SCRIPT)) { -+ -+ if(!compiled_source_script) { -+ syslog(LOG_WARNING, "autocreate_sieve: To save a compiled sieve script, autocreate_sieve_compiledscript must have been defined in imapd.conf"); -+ return 0; -+ } -+ -+ if(snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script) >= sizeof(sieve_tmpname)) -+ return 0; -+ -+ /* -+ * Copy everything from the newly created bc sieve sieve script. -+ */ -+ if((in_fd = open(sieve_bcscript_name, O_RDONLY))<0) { -+ return 0; -+ } -+ -+ if((out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0) { -+ if(errno == EEXIST) { -+ /* Someone is already doing this so just bail out. */ -+ syslog(LOG_WARNING, "autocreate_sieve: %s already exists. Some other instance processing it, or it is left over", sieve_tmpname); -+ close(in_fd); -+ return 0; -+ } else if (errno == EACCES) { -+ syslog(LOG_WARNING,"autocreate_sieve: No access to create file %s. Check permissions",sieve_tmpname); -+ close(in_fd); -+ return 0; -+ } else { -+ syslog(LOG_WARNING,"autocreate_sieve: Unable to create %s",sieve_tmpname); -+ close(in_fd); -+ return 0; -+ } -+ } -+ -+ while((r = read(in_fd, buf, sizeof(buf))) > 0) { -+ if((k = write(out_fd,buf,r)) < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno); -+ close(out_fd); -+ close(in_fd); -+ unlink(sieve_tmpname); -+ return 0; -+ } -+ } -+ -+ if(r == 0 ) { /*EOF */ -+ close(out_fd); -+ close(in_fd); -+ } else if (r < 0) { -+ syslog(LOG_WARNING, "autocreate_sieve: Error writing to file: %s, error: %d", sieve_tmpname, errno); -+ close(out_fd); -+ close(in_fd); -+ unlink(sieve_tmpname); -+ return 0; -+ } -+ -+ /* Rename the temporary created sieve script to its final name. */ -+ if(rename(sieve_tmpname, compiled_source_script)) { -+ if(errno != EEXIST) { -+ unlink(sieve_tmpname); -+ unlink(compiled_source_script); -+ } -+ return 0; -+ } -+ -+ syslog(LOG_NOTICE, "autocreate_sieve: Compiled sieve script was successfully saved in %s", compiled_source_script); -+ } -+ -+ return 0; -+} -+ -+static void fatal(const char *s, int code) -+{ -+ printf("Fatal error: %s (%d)\r\n", s, code); -+ exit(1); -+} -+ -+/* to make larry's stupid functions happy :) */ -+static void foo(void) -+{ -+ fatal("stub function called", 0); -+} -+ -+static int sieve_notify(void *ac __attribute__((unused)), -+ void *interp_context __attribute__((unused)), -+ void *script_context __attribute__((unused)), -+ void *message_context __attribute__((unused)), -+ const char **errmsg __attribute__((unused))) -+{ -+ fatal("stub function called", 0); -+ return SIEVE_FAIL; -+} -+ -+static int mysieve_error(int lineno, const char *msg, -+ void *i __attribute__((unused)), void *s) -+{ -+ char buf[1024]; -+ char **errstr = (char **) s; -+ -+ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); -+ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); -+ syslog(LOG_DEBUG, "%s", buf); -+ strcat(*errstr, buf); -+ -+ return SIEVE_OK; -+} -+ -+/* end the boilerplate */ -+ -+/* returns TRUE or FALSE */ -+int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret) -+{ -+ sieve_interp_t *i; -+ sieve_script_t *s; -+ int res; -+ -+ res = sieve_interp_alloc(&i, NULL); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_interp_alloc() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_redirect(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_redirect() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_discard(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_discard() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_reject(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_reject() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_fileinto(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_fileinto() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_keep(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_keep() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_imapflags(i, NULL); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_imapflags() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_size(i, (sieve_get_size *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_size() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_header(i, (sieve_get_header *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_header() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_envelope() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_vacation(i, &vacation2); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_vacation() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_notify(i, &sieve_notify); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_notify() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_parse_error(i, &mysieve_error); -+ if (res != SIEVE_OK) { -+ syslog(LOG_WARNING, "sieve_register_parse_error() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ rewind(stream); -+ -+ *errstr = (char *) xmalloc(20 * sizeof(char)); -+ strcpy(*errstr, "script errors:\r\n"); -+ -+ res = sieve_script_parse(i, stream, errstr, &s); -+ -+ if (res == SIEVE_OK) { -+ if(ret) { -+ *ret = s; -+ } else { -+ sieve_script_free(&s); -+ } -+ free(*errstr); -+ *errstr = NULL; -+ } -+ -+ /* free interpreter */ -+ sieve_interp_free(&i); -+ -+ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL; -+} -+ -+/* -+ * Btw the initial date of this patch is Sep, 02 2004 which is the birthday of -+ * Pavlos. Author of cyrusmaster. So consider this patch as his birthday present -+ */ -+ -diff -Naur cyrus-imapd-2.2.12/imap/compile_sieve.c cyrus-imapd-2.2.12.autocreate2/imap/compile_sieve.c ---- cyrus-imapd-2.2.12/imap/compile_sieve.c 1970-01-01 02:00:00.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/imap/compile_sieve.c 2005-10-19 14:48:57.943407000 +0300 -@@ -0,0 +1,364 @@ -+/* This tool compiles the sieve script from a command -+line so that it can be used wby the autoadd patch */ -+#include <stdio.h> -+#include <stdlib.h> -+ -+#include <config.h> -+#include <string.h> -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+#include <errno.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <sys/uio.h> -+#include <fcntl.h> -+#include <ctype.h> -+#include <time.h> -+#include <com_err.h> -+ -+#include "global.h" -+ -+#include "util.h" -+#include "mailbox.h" -+#include "imap_err.h" -+#include "sieve_interface.h" -+#include "script.h" -+ -+#include <pwd.h> -+ -+#define TIMSIEVE_FAIL -1 -+#define TIMSIEVE_OK 0 -+#define MAX_FILENAME_SIZE 100 -+ -+/* Needed by libconfig */ -+const int config_need_data = 0; -+ -+static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret); -+ -+static void fatal(const char *s, int code) -+{ -+ printf("Fatal error: %s (%d)\r\n", s, code); -+ -+ exit(1); -+} -+ -+void usage(void) -+{ -+ fprintf(stderr, -+ "Usage:\n\tcompile_sieve [-C <altconfig>] [-i <infile> -o <outfile>]\n"); -+ exit(-1); -+} -+ -+ -+int main (int argc, char **argv) -+{ -+ -+ sieve_script_t *s = NULL; -+ bytecode_info_t *bc = NULL; -+ char *err = NULL; -+ FILE *in_stream; -+ int out_fd,r, k, opt; -+ char *source_script = NULL; -+ char *compiled_source_script = NULL; -+ mode_t oldmask; -+ struct stat statbuf; -+ char *alt_config = NULL; -+ extern char *optarg; -+ char sieve_tmpname[MAX_MAILBOX_NAME+1]; -+ -+ if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE); -+ -+ while((opt = getopt(argc, argv, "C:i:o:")) != EOF) { -+ switch (opt) { -+ case 'C': /* alt config file */ -+ alt_config = optarg; -+ break; -+ case 'i': /* input script file */ -+ source_script = optarg; -+ break; -+ case 'o': /* output script file */ -+ compiled_source_script = optarg; -+ break; -+ default: -+ usage(); -+ break; -+ } -+ } -+ -+ if(source_script && !compiled_source_script) { -+ fprintf(stderr, "No output file was defined\n"); -+ usage(); -+ } else if (!source_script && compiled_source_script) { -+ fprintf(stderr, "No input file was defined\n"); -+ usage(); -+ } -+ -+ /* -+ * If no <infile> has been defined, then read them from -+ * the configuration file. -+ */ -+ if (!source_script && !compiled_source_script) { -+ cyrus_init(alt_config, "compile_sieve", 0); -+ -+ /* Initially check if we want to have the sieve script created */ -+ if(!(source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT))) { -+ fprintf(stderr,"autocreate_sieve_script option not defined. Check imapd.conf\n"); -+ return 1; -+ } -+ -+ /* Check if we have an already compiled sieve script*/ -+ if(!(compiled_source_script = (char *) config_getstring(IMAPOPT_AUTOCREATE_SIEVE_COMPILEDSCRIPT))) { -+ fprintf(stderr, "autocreate_sieve_compiledscript option not defined. Check imapd.conf\n"); -+ return 1; -+ } -+ -+ if(!strrchr(source_script,'/') || !strrchr(compiled_source_script,'/')) { -+ /* -+ * At this point the only think that is inconsistent is the directory -+ * that was created. But if the user will have any sieve scripts then -+ * they will eventually go there, so no big deal -+ */ -+ fprintf(stderr, -+ "In imapd.conf the full path of the filenames must be defined\n"); -+ return 1; -+ } -+ } -+ -+ printf("input file : %s, output file : %s\n", source_script, compiled_source_script); -+ -+ -+ if(strlen(compiled_source_script) + sizeof(".NEW") + 1 > sizeof(sieve_tmpname)) { -+ fprintf(stderr, "Filename %s is too big\n", compiled_source_script); -+ return 1; -+ } -+ -+ snprintf(sieve_tmpname, sizeof(sieve_tmpname), "%s.NEW", compiled_source_script); -+ -+ in_stream = fopen(source_script,"r"); -+ -+ if(!in_stream) { -+ fprintf(stderr,"Unable to open %s source sieve script\n",source_script); -+ return; -+ } -+ -+ /* -+ * We open the file that will be used as the bc file. If this file exists, overwrite it -+ * since something bad has happened. We open the file here so that this error checking is -+ * done before we try to open the rest of the files to start copying etc. -+ */ -+ out_fd = open(sieve_tmpname, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); -+ if(out_fd < 0) { -+ if(errno == EEXIST) { -+ fprintf(stderr, "File %s already exists\n", sieve_tmpname); -+ } else if (errno == EACCES) { -+ fprintf(stderr,"No access to create file %s. Please check that you have the correct permissions\n", -+ sieve_tmpname); -+ } else { -+ fprintf(stderr,"Unable to create %s. Please check that you have the correct permissions\n", -+ sieve_tmpname); -+ } -+ -+ fclose(in_stream); -+ return 1; -+ } -+ -+ if(is_script_parsable(in_stream,&err, &s) == TIMSIEVE_FAIL) { -+ if(err && *err) { -+ fprintf(stderr, "Error while parsing script %s\n",err); -+ free(err); -+ } -+ else -+ fprintf(stderr,"Error while parsing script\n"); -+ unlink(sieve_tmpname); -+ fclose(in_stream); -+ close(out_fd); -+ return; -+ } -+ -+ -+ /* generate the bytecode */ -+ if(sieve_generate_bytecode(&bc,s) == TIMSIEVE_FAIL) { -+ fprintf(stderr,"Error occured while compiling sieve script\n"); -+ /* removing the copied script and cleaning up memory */ -+ unlink(sieve_tmpname); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return; -+ } -+ if(sieve_emit_bytecode(out_fd,bc) == TIMSIEVE_FAIL) { -+ fprintf(stderr, "Error occured while emitting sieve script\n"); -+ unlink(sieve_tmpname); -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ fclose(in_stream); -+ close(out_fd); -+ return; -+ } -+ -+ /* clean up the memory */ -+ sieve_free_bytecode(&bc); -+ sieve_script_free(&s); -+ -+ close(out_fd); -+ -+ if(rename(sieve_tmpname, compiled_source_script)) { -+ if(errno != EEXIST) { -+ unlink(sieve_tmpname); -+ unlink(compiled_source_script); -+ return 1; -+ } -+ } -+ return 0; -+} -+ -+ -+/* to make larry's stupid functions happy :) */ -+static void foo(void) -+{ -+ fatal("stub function called", 0); -+} -+ -+extern sieve_vacation_t vacation2;/* = { -+ 0, / min response / -+ 0, / max response / -+ (sieve_callback *) &foo, / autorespond() / -+ (sieve_callback *) &foo / send_response() / -+}; */ -+ -+static int sieve_notify(void *ac __attribute__((unused)), -+ void *interp_context __attribute__((unused)), -+ void *script_context __attribute__((unused)), -+ void *message_context __attribute__((unused)), -+ const char **errmsg __attribute__((unused))) -+{ -+ fatal("stub function called", 0); -+ return SIEVE_FAIL; -+} -+ -+static int mysieve_error(int lineno, const char *msg, -+ void *i __attribute__((unused)), void *s) -+{ -+ char buf[1024]; -+ char **errstr = (char **) s; -+ -+ snprintf(buf, 80, "line %d: %s\r\n", lineno, msg); -+ *errstr = (char *) xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30); -+ fprintf(stderr, "%s\n", buf); -+ strcat(*errstr, buf); -+ -+ return SIEVE_OK; -+} -+ -+/* end the boilerplate */ -+ -+/* returns TRUE or FALSE */ -+int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret) -+{ -+ sieve_interp_t *i; -+ sieve_script_t *s; -+ int res; -+ -+ res = sieve_interp_alloc(&i, NULL); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_interp_alloc() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_redirect(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_redirect() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_discard(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_discard() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_reject(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_reject() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_fileinto(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_fileinto() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ res = sieve_register_keep(i, (sieve_callback *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_keep() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_imapflags(i, NULL); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_imapflags() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_size(i, (sieve_get_size *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_size() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_header(i, (sieve_get_header *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_header() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_envelope(i, (sieve_get_envelope *) &foo); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_envelope() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_vacation(i, &vacation2); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_vacation() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_notify(i, &sieve_notify); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_notify() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ res = sieve_register_parse_error(i, &mysieve_error); -+ if (res != SIEVE_OK) { -+ fprintf(stderr, "sieve_register_parse_error() returns %d\n", res); -+ return TIMSIEVE_FAIL; -+ } -+ -+ rewind(stream); -+ -+ *errstr = (char *) xmalloc(20 * sizeof(char)); -+ strcpy(*errstr, "script errors:\r\n"); -+ -+ res = sieve_script_parse(i, stream, errstr, &s); -+ -+ if (res == SIEVE_OK) { -+ if(ret) { -+ *ret = s; -+ } else { -+ sieve_script_free(&s); -+ } -+ free(*errstr); -+ *errstr = NULL; -+ } -+ -+ /* free interpreter */ -+ sieve_interp_free(&i); -+ -+ return (res == SIEVE_OK) ? TIMSIEVE_OK : TIMSIEVE_FAIL; -+} -+ -+ -+ -+ -+ -+ -diff -Naur cyrus-imapd-2.2.12/imap/imapd.c cyrus-imapd-2.2.12.autocreate2/imap/imapd.c ---- cyrus-imapd-2.2.12/imap/imapd.c 2005-02-14 08:39:55.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/imap/imapd.c 2005-10-19 14:48:57.966749000 +0300 -@@ -158,6 +158,7 @@ - void motd_file(int fd); - void shut_down(int code); - void fatal(const char *s, int code); -+void autocreate_inbox(void); - - void cmdloop(void); - void cmd_login(char *tag, char *user); -@@ -1693,6 +1694,42 @@ - } - - /* -+ * Autocreate Inbox and subfolders upon login -+ */ -+void autocreate_inbox() -+{ -+ char inboxname[MAX_MAILBOX_NAME+1]; -+ int autocreatequota; -+ int r; -+ -+ /* -+ * Exlude admin's accounts -+ */ -+ if (imapd_userisadmin || imapd_userisproxyadmin) -+ return; -+ -+ /* -+ * Exclude anonymous -+ */ -+ if (!strcmp(imapd_userid, "anonymous")) -+ return; -+ -+ if ((autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) { -+ /* This is actyally not required -+ as long as the lenght of userid is ok */ -+ r = (*imapd_namespace.mboxname_tointernal) (&imapd_namespace, -+ "INBOX", imapd_userid, inboxname); -+ if (!r) -+ r = mboxlist_lookup(inboxname, NULL, NULL, NULL); -+ -+ if (r == IMAP_MAILBOX_NONEXISTENT) -+ mboxlist_autocreateinbox(&imapd_namespace, imapd_userid, -+ imapd_authstate, inboxname, autocreatequota); -+ } -+} -+ -+ -+/* - * Perform a LOGIN command - */ - void cmd_login(char *tag, char *user) -@@ -1848,6 +1885,9 @@ - strcspn(imapd_userid, "@") : 0); - - freebuf(&passwdbuf); -+ -+ autocreate_inbox(); -+ - return; - } - -@@ -1993,6 +2033,8 @@ - config_virtdomains ? - strcspn(imapd_userid, "@") : 0); - -+ autocreate_inbox(); -+ - return; - } - -diff -Naur cyrus-imapd-2.2.12/imap/lmtpd.c cyrus-imapd-2.2.12.autocreate2/imap/lmtpd.c ---- cyrus-imapd-2.2.12/imap/lmtpd.c 2004-12-17 18:32:15.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/imap/lmtpd.c 2005-10-19 14:48:57.971145000 +0300 -@@ -106,6 +106,8 @@ - static FILE *spoolfile(message_data_t *msgdata); - static void removespool(message_data_t *msgdata); - -+static int autocreate_inbox(char *rcpt_userid); -+ - /* current namespace */ - static struct namespace lmtpd_namespace; - -@@ -504,10 +506,55 @@ - exit(code); - } - -+/* -+ * Autocreate Inbox and subfolders upon login -+ */ -+int autocreate_inbox(char *rcpt_userid) -+{ -+ struct auth_state *authstate; -+ char inboxname[MAX_MAILBOX_NAME+1]; -+ int rcptisadmin; -+ int autocreatequota; -+ int r; -+ -+ if(rcpt_userid == NULL) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Exclude anonymous -+ */ -+ if (!strcmp(rcpt_userid, "anonymous")) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Check for autocreatequota and createonpost -+ */ -+ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA)) || -+ !(config_getswitch(IMAPOPT_CREATEONPOST))) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Exclude admin's accounts -+ */ -+ authstate = auth_newstate(rcpt_userid); -+ rcptisadmin = global_authisa(authstate, IMAPOPT_ADMINS); -+ if (rcptisadmin) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ r = (*lmtpd_namespace.mboxname_tointernal) (&lmtpd_namespace, -+ "INBOX", rcpt_userid, inboxname); -+ if (!r) -+ r = mboxlist_autocreateinbox(&lmtpd_namespace, rcpt_userid, -+ authstate, inboxname, autocreatequota); -+ return r; -+} -+ -+ - static int verify_user(const char *user, const char *domain, const char *mailbox, - long quotacheck, struct auth_state *authstate) - { - char namebuf[MAX_MAILBOX_NAME+1] = ""; -+ char *userinbox = NULL; - int r = 0; - - if ((!user && !mailbox) || -@@ -545,6 +592,28 @@ - */ - r = append_check(namebuf, MAILBOX_FORMAT_NORMAL, authstate, - !user ? ACL_POST : 0, quotacheck > 0 ? 0 : quotacheck); -+ if (r == IMAP_MAILBOX_NONEXISTENT && user) { -+ if(domain) { -+ int k; -+ userinbox = (char *)xmalloc((strlen(user)+strlen(domain)+2)*sizeof(char)); -+ k = strlcpy(userinbox, user, strlen(user)+1); -+ *(userinbox + k) = '@'; -+ strlcpy(userinbox+k+1, domain, strlen(domain)+1); -+ } -+ else userinbox = user; -+ /* -+ * Try to create automatically the mailbox, if -+ * autocreate inbox option is enabled. -+ */ -+ r = autocreate_inbox(userinbox); -+ -+ if(userinbox != user) -+ free(userinbox); -+ if (!r) -+ r = append_check(namebuf, MAILBOX_FORMAT_NORMAL, authstate, -+ 0, quotacheck > 0 ? 0 : quotacheck); -+ } -+ - } - - if (r) syslog(LOG_DEBUG, "verify_user(%s) failed: %s", namebuf, -diff -Naur cyrus-imapd-2.2.12/imap/mboxlist.c cyrus-imapd-2.2.12.autocreate2/imap/mboxlist.c ---- cyrus-imapd-2.2.12/imap/mboxlist.c 2004-07-26 21:08:03.000000000 +0300 -+++ cyrus-imapd-2.2.12.autocreate2/imap/mboxlist.c 2005-10-19 14:49:25.972032000 +0300 -@@ -81,6 +81,12 @@ - #include "mboxlist.h" - #include "quota.h" - -+#ifdef USE_SIEVE -+extern int autoadd_sieve(char *userid, -+ const char *source_script); -+#endif -+ -+ - #define DB config_mboxlist_db - #define SUBDB config_subscription_db - -@@ -98,11 +104,29 @@ - static int mboxlist_changequota(const char *name, int matchlen, int maycreate, - void *rock); - -+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate, -+ void *rock); -+ -+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace, -+ char *userid, char *auth_userid, -+ struct auth_state *auth_state); -+ - struct change_rock { - struct quota *quota; - struct txn **tid; - }; - -+/* -+ * Struct needed to be passed as void *rock to -+ * mboxlist_autochangesub(); -+ */ -+struct changesub_rock_st { -+ char *userid; -+ char *auth_userid; -+ struct auth_state *auth_state; -+}; -+ -+ - #define FNAME_SUBSSUFFIX ".sub" - - /* -@@ -3124,3 +3148,338 @@ - - return DB->abort(mbdb, tid); - } -+ -+/* -+ * Automatically subscribe user to *ALL* shared folders, -+ * one has permissions to be subscribed to. -+ * INBOX subfolders are excluded. -+ */ -+static int mboxlist_autochangesub(char *name, int matchlen, int maycreate, -+ void *rock) { -+ -+ struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock; -+ char *userid = changesub_rock->userid; -+ char *auth_userid = changesub_rock->auth_userid; -+ struct auth_state *auth_state = changesub_rock->auth_state; -+ int r; -+ -+ -+ if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */ -+ (strlen(name) > 5 && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */ -+ (strlen(name) > 4 && !strncmp(name, "user.", 5))) /* Exclude other users' folders */ -+ return 0; -+ -+ -+ r = mboxlist_changesub(name, userid, auth_state, 1, 0); -+ -+ if (r) { -+ syslog(LOG_WARNING, -+ "autosubscribe: User %s to folder %s, subscription failed: %s", -+ auth_userid, name, error_message(r)); -+ } else { -+ syslog(LOG_NOTICE, -+ "autosubscribe: User %s to folder %s, subscription succeeded", -+ auth_userid, name); -+ } -+ -+ return 0; -+} -+ -+#define SEP '|' -+ -+/* -+ * Automatically subscribe user to a shared folder. -+ * Subscription is done successfully, if the shared -+ * folder exists and the user has the necessary -+ * permissions. -+ */ -+static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace, -+ char *userid, char *auth_userid, -+ struct auth_state *auth_state) { -+ -+ const char *sub ; -+ char *p, *q, *next_sub; -+ char folder[MAX_MAILBOX_NAME+1], name[MAX_MAILBOX_NAME+1], mailboxname[MAX_MAILBOX_NAME+1]; -+ int len; -+ int r = 0; -+ int subscribe_all_sharedfolders = 0; -+ -+ subscribe_all_sharedfolders = config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS); -+ -+ /* -+ * If subscribeallsharedfolders is set to yes in imapd.conf, then -+ * subscribe user to every shared folder one has the apropriate -+ * permissions. -+ */ -+ if(subscribe_all_sharedfolders) { -+ char pattern[MAX_MAILBOX_PATH+1]; -+ struct changesub_rock_st changesub_rock; -+ -+ strcpy(pattern, "*"); -+ changesub_rock.userid = userid; -+ changesub_rock.auth_userid = auth_userid; -+ changesub_rock.auth_state = auth_state; -+ -+ r = mboxlist_findall(namespace, pattern, 0, userid, -+ auth_state, mboxlist_autochangesub, &changesub_rock); -+ -+ return r; -+ } -+ -+ if ((sub=config_getstring(IMAPOPT_AUTOSUBSCRIBESHAREDFOLDERS)) == NULL) -+ return r; -+ -+ next_sub = (char *) sub; -+ while (*next_sub) { -+ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++); -+ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++); -+ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--); -+ if (!*p ) continue; -+ -+ len = q - p + 1; -+ /* Check for folder length */ -+ if (len > sizeof(folder)-1) -+ continue; -+ -+ if (!r) { -+ strncpy(folder, p, len); -+ folder[len] = '\0'; -+ -+ strlcpy(name, namespace->prefix[NAMESPACE_SHARED], sizeof(name)); -+ len = strlcat(name, folder, sizeof(name)); -+ -+ r = (namespace->mboxname_tointernal) (namespace, name, userid, -+ mailboxname); -+ } -+ -+ if (!r) -+ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 0); -+ -+ if (!r) { -+ syslog(LOG_NOTICE, "autosubscribe: User %s to %s succeeded", -+ userid, folder); -+ } else { -+ syslog(LOG_WARNING, "autosubscribe: User %s to %s failed: %s", -+ userid, folder, error_message(r)); -+ r = 0; -+ } -+ } -+ -+ return r; -+} -+ -+ -+ -+int mboxlist_autocreateinbox(struct namespace *namespace, -+ char *userid, -+ struct auth_state *auth_state, -+ char *mailboxname, int autocreatequota) { -+ char name [MAX_MAILBOX_NAME+1]; -+ char folder [MAX_MAILBOX_NAME+1]; -+ char *auth_userid = NULL; -+ char *partition = NULL; -+ const char *crt; -+ const char *sub; -+ char *p, *q, *next_crt, *next_sub; -+ int len; -+ int r = 0; -+ int numcrt = 0; -+ int numsub = 0; -+#ifdef USE_SIEVE -+ const char *source_script; -+#endif -+ -+ /* -+ * While this is not needed for admins -+ * and imap_admins accounts, it would be -+ * better to separate *all* admins and -+ * proxyservers from normal accounts -+ * (accounts that have mailboxes). -+ * UOA Specific note(1): Even if we do not -+ * exclude these servers-classes here, -+ * UOA specific code, will neither return -+ * role, nor create INBOX, because none of these -+ * administrative accounts belong to the -+ * mailRecipient objectclass, or have imapPartition. -+ * UOA Specific note(2): Another good reason for doing -+ * this, is to prevent the code, from getting into -+ * cyrus_ldap.c because of the continues MSA logins to LMTPd. -+ */ -+ -+ /* -+ * admins and the coresponding imap -+ * service, had already been excluded. -+ */ -+ -+ /* -+ * Do we really need group membership -+ * for admins or service_admins? -+ */ -+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) return 0; -+ if (global_authisa(auth_state, IMAPOPT_ADMINS)) return 0; -+ -+ /* -+ * Do we really need group membership -+ * for proxyservers? -+ */ -+ if (global_authisa(auth_state, IMAPOPT_PROXYSERVERS)) return 0; -+ if (global_authisa(auth_state, IMAPOPT_PROXYSERVERS)) return 0; -+ -+ auth_userid = auth_canonuser(auth_state); -+ -+ if (auth_userid == NULL) { -+ /* -+ * Couldn't get cannon userid -+ */ -+ syslog(LOG_ERR, -+ "Could not get cannon userid for user %s", userid); -+ return IMAP_PARTITION_UNKNOWN; -+ } -+ -+#if 0 -+ /* -+ * Get Partition info or return. -+ * (Here you should propably use -+ * you own "get_partition(char *userid)" -+ * function. Otherwise all new INBOXes will be -+ * created into whatever partition has been declared -+ * as default in your imapd.conf) -+ */ -+ -+ partition = get_partition(userid); -+ -+ if (partition == NULL) { -+ /* -+ * Couldn't get partition info -+ */ -+ syslog(LOG_ERR, -+ "Could not get imapPartition info for user %s", userid); -+ return IMAP_PARTITION_UNKNOWN; -+ } -+#endif -+ -+ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL, -+ 1, userid, auth_state, 0, 0, 0); -+ -+ if (!r && autocreatequota > 0) -+ r = mboxlist_setquota(mailboxname, autocreatequota, 0); -+ -+ if (!r) -+ r = mboxlist_changesub(mailboxname, userid, -+ auth_state, 1, 1); -+ -+ if (!r) { -+ syslog(LOG_NOTICE, "autocreateinbox: User %s, INBOX was successfully created in partition %s", -+ auth_userid, partition == NULL ? "default" : partition); -+ } else { -+ syslog(LOG_ERR, "autocreateinbox: User %s, INBOX failed. %s", -+ auth_userid, error_message(r)); -+ } -+ -+ -+#if 0 -+ /* Allocated from get_partition, and not needed any more */ -+ free_partition(partition); -+#endif -+ -+ if (r) return r; -+ -+ -+ /* INBOX's subfolders */ -+ if ((crt=config_getstring(IMAPOPT_AUTOCREATEINBOXFOLDERS))) -+ sub=config_getstring(IMAPOPT_AUTOSUBSCRIBEINBOXFOLDERS); -+ -+ /* Roll through crt */ -+ next_crt = (char *) crt; -+ while (next_crt!=NULL && *next_crt) { -+ for (p = next_crt ; isspace((int) *p) || *p == SEP ; p++); -+ for (next_crt = p ; *next_crt && *next_crt != SEP ; next_crt++); -+ for (q = next_crt ; q > p && (isspace((int) *q) || *q == SEP || !*q); q--); -+ -+ if (!*p) continue; -+ -+ len = q - p + 1; -+ -+ /* First time we check for length */ -+ if (len > sizeof(folder) - 5) -+ r = IMAP_MAILBOX_BADNAME; -+ -+ if (!r) { -+ strncpy(folder, p, len); -+ folder[len] = '\0'; -+ -+ strlcpy(name, namespace->prefix[NAMESPACE_INBOX], sizeof(name)); -+ len = strlcat(name, folder, sizeof(name)); -+ } -+ -+ if (!r) -+ r = (namespace->mboxname_tointernal) (namespace, name, userid, -+ mailboxname); -+ if (!r) -+ r = mboxlist_createmailbox(mailboxname, MAILBOX_FORMAT_NORMAL, NULL, -+ 1, userid, auth_state, 0, 0, 0); -+ -+ if (!r) { -+ numcrt++; -+ syslog(LOG_NOTICE, "autocreateinbox: User %s, subfolder %s creation succeeded.", -+ auth_userid, name); -+ } else { -+ syslog(LOG_WARNING, "autocreateinbox: User %s, subfolder %s creation failed. %s", -+ auth_userid, name, error_message(r)); -+ r=0; -+ continue; -+ } -+ -+ /* Roll through sub */ -+ next_sub = (char *) sub; -+ while (next_sub!=NULL && *next_sub) { -+ for (p = next_sub ; isspace((int) *p) || *p == SEP ; p++); -+ for (next_sub = p ; *next_sub && *next_sub != SEP ; next_sub++); -+ for (q = next_sub ; q > p && (isspace((int) *q) || *q == SEP || !*q) ; q--); -+ if (!*p ) continue; -+ -+ len = q - p + 1; -+ -+ if (len != strlen(folder) || strncmp(folder, p, len)) -+ continue; -+ -+ r = mboxlist_changesub(mailboxname, userid, auth_state, 1, 1); -+ -+ if (!r) { -+ numsub++; -+ syslog(LOG_NOTICE,"autocreateinbox: User %s, subscription to %s succeeded", -+ auth_userid, name); -+ } else -+ syslog(LOG_WARNING, "autocreateinbox: User %s, subscription to %s failed. %s", -+ auth_userid, name, error_message(r)); -+ -+ break; -+ } -+ } -+ -+ if (crt!=NULL && *crt) -+ syslog(LOG_INFO, "User %s, Inbox subfolders, created %d, subscribed %d", -+ auth_userid, numcrt, numsub); -+ -+ /* -+ * Check if shared folders are available for subscription. -+ */ -+ mboxlist_autosubscribe_sharedfolders(namespace, userid, auth_userid, auth_state); -+ -+#ifdef USE_SIEVE -+ /* -+ * Here the autocreate sieve script feature is iniated from. -+ */ -+ source_script = config_getstring(IMAPOPT_AUTOCREATE_SIEVE_SCRIPT); -+ -+ if (source_script) { -+ if (!autoadd_sieve(userid, source_script)) -+ syslog(LOG_NOTICE, "autocreate_sieve: User %s, default sieve script creation succeeded", auth_userid); -+ else -+ syslog(LOG_WARNING, "autocreate_sieve: User %s, default sieve script creation failed", auth_userid); -+ } -+#endif -+ -+ return r; -+} -+ -diff -Naur cyrus-imapd-2.2.12/imap/mboxlist.h cyrus-imapd-2.2.12.autocreate2/imap/mboxlist.h ---- cyrus-imapd-2.2.12/imap/mboxlist.h 2004-03-17 20:07:49.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/imap/mboxlist.h 2005-10-19 14:48:58.027033000 +0300 -@@ -197,4 +197,10 @@ - int mboxlist_commit(struct txn *tid); - int mboxlist_abort(struct txn *tid); - -+int mboxlist_autocreateinbox(struct namespace *namespace, -+ char *userid, -+ struct auth_state *auth_state, -+ char *mailboxname, int autocreatequota); -+ -+ - #endif -diff -Naur cyrus-imapd-2.2.12/imap/pop3d.c cyrus-imapd-2.2.12.autocreate2/imap/pop3d.c ---- cyrus-imapd-2.2.12/imap/pop3d.c 2005-01-04 17:06:13.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/imap/pop3d.c 2005-10-19 14:48:58.033335000 +0300 -@@ -152,6 +152,8 @@ - static char popd_apop_chal[45 + MAXHOSTNAMELEN + 1]; /* <rand.time@hostname> */ - static void cmd_apop(char *response); - -+static int autocreate_inbox(char *inboxname, char *userid); -+ - static void cmd_auth(char *arg); - static void cmd_capa(void); - static void cmd_pass(char *pass); -@@ -1084,6 +1086,7 @@ - popd_userid = xstrdup(p); - prot_printf(popd_out, "+OK Name is a valid mailbox\r\n"); - } -+ - } - - void cmd_pass(char *pass) -@@ -1328,6 +1331,46 @@ - } - - /* -+ * Autocreate Inbox and subfolders upon login -+ */ -+int autocreate_inbox(char *inboxname, char *auth_userid) -+{ -+ struct auth_state *authstate; -+ int userisadmin; -+ int autocreatequota; -+ int r; -+ -+ if(inboxname == NULL || auth_userid == NULL) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Exclude anonymous -+ */ -+ if (!strcmp(popd_userid, "anonymous")) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Check for autocreatequota -+ */ -+ if (!(autocreatequota = config_getint(IMAPOPT_AUTOCREATEQUOTA))) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ /* -+ * Exclude admin's accounts -+ */ -+ -+ authstate = auth_newstate(popd_userid); -+ userisadmin = global_authisa(authstate, IMAPOPT_ADMINS); -+ if (userisadmin) -+ return IMAP_MAILBOX_NONEXISTENT; -+ -+ r = mboxlist_autocreateinbox(&popd_namespace, auth_userid, -+ authstate, inboxname, autocreatequota); -+ return r; -+} -+ -+ -+/* - * Complete the login process by opening and locking the user's inbox - */ - int openinbox(void) -@@ -1349,6 +1392,10 @@ - userid, inboxname); - - if (!r) r = mboxlist_detail(inboxname, &type, NULL, &server, &acl, NULL); -+ /* Try once again after autocreate_inbox */ -+ if (r == IMAP_MAILBOX_NONEXISTENT && !(r = autocreate_inbox(inboxname, userid))) -+ r = mboxlist_detail(inboxname, &type, NULL, &server, &acl, NULL); -+ - if (!r && (config_popuseacl = config_getswitch(IMAPOPT_POPUSEACL)) && - (!acl || - !((myrights = cyrus_acl_myrights(popd_authstate, acl)) & ACL_READ))) { -diff -Naur cyrus-imapd-2.2.12/lib/auth.h cyrus-imapd-2.2.12.autocreate2/lib/auth.h ---- cyrus-imapd-2.2.12/lib/auth.h 2003-10-22 21:50:12.000000000 +0300 -+++ cyrus-imapd-2.2.12.autocreate2/lib/auth.h 2005-10-19 14:48:58.035324000 +0300 -@@ -60,4 +60,6 @@ - extern struct auth_state *auth_newstate(const char *identifier); - extern void auth_freestate(struct auth_state *auth_state); - -+extern char *auth_canonuser(struct auth_state *auth_state); -+ - #endif /* INCLUDED_AUTH_H */ -diff -Naur cyrus-imapd-2.2.12/lib/auth_krb.c cyrus-imapd-2.2.12.autocreate2/lib/auth_krb.c ---- cyrus-imapd-2.2.12/lib/auth_krb.c 2003-11-11 05:26:00.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/lib/auth_krb.c 2005-10-19 14:48:58.038180000 +0300 -@@ -338,3 +338,11 @@ - free((char *)auth_state); - } - -+char * -+auth_canonuser(struct auth_state *auth_state) -+{ -+ if (auth_state) -+ return auth_state->userid; -+ return NULL; -+} -+ -diff -Naur cyrus-imapd-2.2.12/lib/auth_krb5.c cyrus-imapd-2.2.12.autocreate2/lib/auth_krb5.c ---- cyrus-imapd-2.2.12/lib/auth_krb5.c 2004-01-16 17:28:58.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/lib/auth_krb5.c 2005-10-19 14:48:58.040108000 +0300 -@@ -193,4 +193,11 @@ - free(auth_state); - } - -+char * -+auth_canonuser(struct auth_state *auth_state) -+{ -+ if (auth_state) -+ return auth_state->userid; -+ return NULL; -+} - -diff -Naur cyrus-imapd-2.2.12/lib/auth_pts.c cyrus-imapd-2.2.12.autocreate2/lib/auth_pts.c ---- cyrus-imapd-2.2.12/lib/auth_pts.c 2004-02-25 01:11:37.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/lib/auth_pts.c 2005-10-19 14:48:58.042343000 +0300 -@@ -349,3 +349,11 @@ - { - free(auth_state); - } -+ -+char *auth_canonuser(struct auth_state *auth_state) -+{ -+ if (auth_state) -+ return auth_state->userid.id; -+ return NULL; -+} -+ -diff -Naur cyrus-imapd-2.2.12/lib/auth_unix.c cyrus-imapd-2.2.12.autocreate2/lib/auth_unix.c ---- cyrus-imapd-2.2.12/lib/auth_unix.c 2004-09-14 01:49:29.000000000 +0300 -+++ cyrus-imapd-2.2.12.autocreate2/lib/auth_unix.c 2005-10-19 14:48:58.044431000 +0300 -@@ -267,4 +267,11 @@ - free((char *)auth_state); - } - -+char *auth_canonuser(struct auth_state *auth_state) -+{ -+ if (auth_state) -+ return auth_state->userid; -+ -+ return NULL; -+} - -diff -Naur cyrus-imapd-2.2.12/lib/imapoptions cyrus-imapd-2.2.12.autocreate2/lib/imapoptions ---- cyrus-imapd-2.2.12/lib/imapoptions 2004-07-21 22:07:45.000000000 +0300 -+++ cyrus-imapd-2.2.12.autocreate2/lib/imapoptions 2005-10-19 14:48:58.048748000 +0300 -@@ -169,6 +169,51 @@ - /* Number of seconds to wait before returning a timeout failure when - performing a client connection (e.g. in a murder enviornment) */ - -+{ "createonpost", 0, SWITCH } -+/* If yes, when lmtpd receives an incoming mail for an INBOX that does not exist, -+ then the INBOX is automatically created by lmtpd. */ -+ -+{ "autocreateinboxfolders", NULL, STRING } -+/* If a user does not have an INBOX created then the INBOX as well as some INBOX subfolders are -+ created under two conditions. -+ 1. The user logins via the IMAP or the POP3 protocol. (autocreatequota option must have a nonzero value) -+ 2. A message arrives for the user through the LMTPD protocol.(createonpost option must yes) -+ autocreateinboxfolders is a list of INBOX's subfolders separated by a "|", that are automatically created by the server -+ under the previous two situations. */ -+ -+{ "autosubscribeinboxfolders", NULL, STRING } -+/* A list of folder names, separated by "|" that the users get automatically subscribed to, when their INBOX -+ is created. -+ These folder names must have been included in the autocreateinboxfolders option of the imapd.conf. */ -+ -+{ "autosubscribesharedfolders", NULL, STRING } -+/* A list of shared folders (bulletin boards), separated by "|" that the users get -+ automatically subscribed to, after their INBOX -+ is created. The shared folder must have been created and the user must have the -+ required permissions to get subscribed to the it. Otherwise the subscription fails. */ -+ -+{ "autosubscribe_all_sharedfolders", 0, SWITCH } -+/* If set to yes then the user is automatically subscribed to all shared folders, one has permission -+ to subscribe to. */ -+ -+{ "autocreate_sieve_script", NULL, STRING } -+/* The full path of a file that contains a sieve script. This script automatically becomes a -+ user's initial default sieve filter script. When this option is not defined, no default -+ sieve filter is created. The file must be readable by the cyrus daemon. */ -+ -+{ "autocreate_sieve_compiledscript", NULL, STRING } -+/* The full path of a file that contains a compiled in bytecode sieve script. This script -+ automatically becomes a user's initial default sieve filter script. -+ If this option is not specified, or the filename doesn't exist then the script defined -+ by autocreate_sieve_script is compiled on the fly and installed as the user's default -+ sieve script */ -+ -+{ "generate_compiled_sieve_script", 0, SWITCH } -+/* If set to yes and no compiled sieve script file exists then the sieve script that is -+ compiled on the fly will be saved in the file name that autocreate_sieve_compiledscript -+ option points. In order a compiled script to be generated, autocreate_sieve_script and -+ autocreate_sieve_compiledscript must have valid values */ -+ - { "configdirectory", NULL, STRING } - /* The pathname of the IMAP configuration directory. This field is - required. */ -diff -Naur cyrus-imapd-2.2.12/notifyd/Makefile.in cyrus-imapd-2.2.12.autocreate2/notifyd/Makefile.in ---- cyrus-imapd-2.2.12/notifyd/Makefile.in 2004-05-28 21:03:06.000000000 +0300 -+++ cyrus-imapd-2.2.12.autocreate2/notifyd/Makefile.in 2005-10-19 14:48:58.050575000 +0300 -@@ -69,10 +69,11 @@ - SERVICE=../master/service.o - - IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ -+SIEVE_LIBS = @SIEVE_LIBS@ - IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ - LIB_WRAP = @LIB_WRAP@ - LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS) --DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ -+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ - - PURIFY=/usr/local/bin/purify - PUREOPT=-best-effort -diff -Naur cyrus-imapd-2.2.12/notifyd/notifyd.c cyrus-imapd-2.2.12.autocreate2/notifyd/notifyd.c ---- cyrus-imapd-2.2.12/notifyd/notifyd.c 2004-12-17 18:32:25.000000000 +0200 -+++ cyrus-imapd-2.2.12.autocreate2/notifyd/notifyd.c 2005-10-19 14:48:58.052220000 +0300 -@@ -97,7 +97,7 @@ - - #define NOTIFY_MAXSIZE 8192 - --int do_notify() -+static int do_notify() - { - struct sockaddr_un sun_data; - socklen_t sunlen = sizeof(sun_data); -diff -Naur cyrus-imapd-2.2.12/ptclient/Makefile.in cyrus-imapd-2.2.12.autocreate2/ptclient/Makefile.in ---- cyrus-imapd-2.2.12/ptclient/Makefile.in 2004-05-28 21:03:08.000000000 +0300 -+++ cyrus-imapd-2.2.12.autocreate2/ptclient/Makefile.in 2005-10-19 14:48:58.053762000 +0300 -@@ -57,10 +57,11 @@ - AFS_LDFLAGS = @AFS_LDFLAGS@ @COM_ERR_LDFLAGS@ - AFS_LIBS = @AFS_LIBS@ - IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ -+SIEVE_LIBS = @SIEVE_LIBS@ - LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@ - LIB_SASL = @LIB_SASL@ - LIB_WRAP = @LIB_WRAP@ --DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ -+DEPLIBS = ../imap/libimap.a $(SIEVE_LIBS) ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ - UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o - - LDAP_LIBS=@LDAP_LIBS@ diff --git a/src/patches/cyrus-imapd-2.2.12-gcc4.patch b/src/patches/cyrus-imapd-2.2.12-gcc4.patch deleted file mode 100644 index 3363beaba..000000000 --- a/src/patches/cyrus-imapd-2.2.12-gcc4.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- tools/config2header 2005/04/13 08:56:16 1.1 -+++ tools/config2header 2005/04/13 08:57:48 -@@ -214,7 +214,6 @@ - print HFILE <<EOF - IMAPOPT_LAST - }; --extern struct imapopt_s imapopts[]; - - enum enum_value { - IMAP_ENUM_ZERO = 0, -@@ -260,6 +259,9 @@ - - print HFILE <<EOF - }; -+ -+extern struct imapopt_s imapopts[]; -+ - #endif /* INCLUDED_IMAPOPTIONS_H */ - EOF - ; ---- imap/fud.c 2005/04/13 09:19:05 1.1 -+++ imap/fud.c 2005/04/13 09:20:02 -@@ -202,6 +202,7 @@ - r = begin_handling(); - - shut_down(r); -+ return 0; - } - - static void cyrus_timeout(int signo __attribute__((unused))) ---- imap/smmapd.c 2005/04/13 09:19:12 1.1 -+++ imap/smmapd.c 2005/04/13 09:19:50 -@@ -199,6 +199,7 @@ - r = begin_handling(); - - shut_down(r); -+ return 0; - } - - int verify_user(const char *key, long quotacheck, ---- notifyd/notifyd.c 2005/04/13 09:19:23 1.1 -+++ notifyd/notifyd.c 2005/04/13 09:19:39 -@@ -266,4 +266,5 @@ - r = do_notify(); - - shut_down(r); -+ return 0; - } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b1a6c9f6243c3ae687fd18297848cc8e7510fbc2
by Arne Fitzenreiter 16 Feb '20

16 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via b1a6c9f6243c3ae687fd18297848cc8e7510fbc2 (commit) via 88cb5eb18744911513c08e851f945a548b324efc (commit) via a8df6e7807528a475a958f0d8aa66494e59b1a8e (commit) via 1466ab70c7bbbf477fbdef69117ada4251ff3a1a (commit) via 18e97c76b0e1f691f5c6be8aa7fedc61d8c07469 (commit) via 56f4f279a5a5bfb2d919f2e603c8551f422e932f (commit) via 130babccc8efbdd80a9358e1faf09faba6ee3e43 (commit) via 08cf4d21540c4fe185db1f17ae365f7ab6adae27 (commit) via f16ddb5fc74128e6387e736e4c7f66ace6d0b338 (commit) via d553895700c1d4842cd62cceaea83f2fd0fd5195 (commit) via 77ea7462bcc134b6147dd985abdd4e2311487515 (commit) via 7b7789da2f79bf00c98139c17c18002388d4f0df (commit) from c2c5bad960f03407b79e7b0afce45157363a55d0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b1a6c9f6243c3ae687fd18297848cc8e7510fbc2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 16 16:02:56 2020 +0000 core142: add cloudinit helper to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 88cb5eb18744911513c08e851f945a548b324efc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 5 14:27:08 2020 +0000 cloud-init: Disable using ISP nameservers This is mostly aesthetic because there are no ISP nameservers anyways that we could use here. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a8df6e7807528a475a958f0d8aa66494e59b1a8e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 5 14:27:07 2020 +0000 aws-setup: Remove some excessive whitespace Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 1466ab70c7bbbf477fbdef69117ada4251ff3a1a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 16 15:59:06 2020 +0000 core142: add dns.cgi to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 18e97c76b0e1f691f5c6be8aa7fedc61d8c07469 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 5 14:27:06 2020 +0000 dns.cgi: Do not show table header if no servers are configured Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 56f4f279a5a5bfb2d919f2e603c8551f422e932f Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 4 08:59:33 2020 +0100 guardian: Add upstream patch for HTTP parser. Fixes #12289. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 130babccc8efbdd80a9358e1faf09faba6ee3e43 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 16 15:55:15 2020 +0000 core142: add ddns to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 08cf4d21540c4fe185db1f17ae365f7ab6adae27 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Feb 7 12:32:46 2020 +0100 ddns: Import latest upstream patches for ddns-013 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f16ddb5fc74128e6387e736e4c7f66ace6d0b338 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Jan 31 07:13:31 2020 +0100 ddns: Update to 013 This is an update to the first python3-based release of ddns. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d553895700c1d4842cd62cceaea83f2fd0fd5195 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 16 15:49:52 2020 +0000 core142: add proxy.cgi tp updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 77ea7462bcc134b6147dd985abdd4e2311487515 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Feb 7 12:06:39 2020 +0100 proxy.cgi: Switch to MD5 hashed passwords for local user auth. The former used default Crypt algorithmus only supports passwords up to eight signs wheater MD5 does not have any limitation here. Fixes 12290. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 7b7789da2f79bf00c98139c17c18002388d4f0df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 6 11:34:27 2020 +0000 libpciaccess: Update to 0.16 There are not rootfile changes. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/104 => core/142}/filelists/ddns | 0 config/rootfiles/core/142/filelists/files | 4 ++ html/cgi-bin/dns.cgi | 71 +++++++++++----------- html/cgi-bin/proxy.cgi | 8 ++- lfs/ddns | 9 ++- lfs/guardian | 5 +- lfs/libpciaccess | 10 +-- src/initscripts/helper/aws-setup | 5 +- src/initscripts/helper/azure-setup | 3 + src/patches/ddns-012-noip-fix-handle-name.patch | 36 ----------- src/patches/ddns-012-noip-rename-provider.patch | 65 -------------------- src/patches/ddns-013-dyfi-use-https.patch | 22 +++++++ src/patches/guardian-2.0.2-http-parser.patch | 45 ++++++++++++++ 13 files changed, 133 insertions(+), 150 deletions(-) copy config/rootfiles/{oldcore/104 => core/142}/filelists/ddns (100%) delete mode 100644 src/patches/ddns-012-noip-fix-handle-name.patch delete mode 100644 src/patches/ddns-012-noip-rename-provider.patch create mode 100644 src/patches/ddns-013-dyfi-use-https.patch create mode 100644 src/patches/guardian-2.0.2-http-parser.patch Difference in files: diff --git a/config/rootfiles/core/142/filelists/ddns b/config/rootfiles/core/142/filelists/ddns new file mode 120000 index 000000000..739516420 --- /dev/null +++ b/config/rootfiles/core/142/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files index 03d6bd379..12df9c26d 100644 --- a/config/rootfiles/core/142/filelists/files +++ b/config/rootfiles/core/142/filelists/files @@ -2,9 +2,13 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs +etc/rc.d/helper/aws-setup +etc/rc.d/helper/azure-setup etc/suricata/suricata.yaml lib/udev/network-hotplug-bridges opt/pakfire/etc/pakfire.conf opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/dns.cgi srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/proxy.cgi var/ipfire/suricata/ruleset-sources diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 4f3418a70..09fd50206 100755 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -449,7 +449,7 @@ sub show_nameservers () { $dns_status_string .= " (" . $Lang::tr{'dns recursor mode'} . ")"; } -print <<END; + print <<END; <table width='100%'> <tr> <td> @@ -458,7 +458,36 @@ print <<END; </td> </tr> </table> +END + + # Check the usage of ISP assigned nameservers is enabled. + my $id = 1; + + # Loop through the array which stores the files. + foreach my $file (@ISP_nameserver_files) { + # Grab the address of the nameserver. + my $address = &General::grab_address_from_file($file); + + # Check if we got an address. + if ($address) { + # Add the address to the hash of nameservers. + $dns_servers{$id} = [ "$address", "none", + ($settings{'USE_ISP_NAMESERVERS'} eq "on") ? "enabled" : "disabled", + "$Lang::tr{'dns isp assigned nameserver'}" ]; + + # Increase id by one. + $id++; + } + } + # Check some DNS servers have been configured. In this case + # the hash contains at least one key. + my $server_amount; + if (keys %dns_servers) { + # Sort the keys by their ID and store them in an array. + my @keys = sort { $a <=> $b } keys %dns_servers; + + print <<END; <br> <table class="tbl" width='100%'> @@ -479,51 +508,23 @@ print <<END; <strong>$Lang::tr{'remark'}</strong> </td> END - # Check if the status should be displayed. - if ($check_servers) { -print <<END + + # Check if the status should be displayed. + if ($check_servers) { + print <<END; <td align="center"> <strong>$Lang::tr{'status'}</strong> </td> END -; - } + } -print <<END + print <<END; <td align="center" colspan="3"> <strong>$Lang::tr{'action'}</strong> </td> </tr> END -; - - # Check the usage of ISP assigned nameservers is enabled. - my $id = 1; - - # Loop through the array which stores the files. - foreach my $file (@ISP_nameserver_files) { - # Grab the address of the nameserver. - my $address = &General::grab_address_from_file($file); - - # Check if we got an address. - if ($address) { - # Add the address to the hash of nameservers. - $dns_servers{$id} = [ "$address", "none", - ($settings{'USE_ISP_NAMESERVERS'} eq "on") ? "enabled" : "disabled", - "$Lang::tr{'dns isp assigned nameserver'}" ]; - - # Increase id by one. - $id++; - } - } - - # Check some DNS servers have been configured. In this case - # the hash contains at least one key. - my $server_amount; - if (keys %dns_servers) { - # Sort the keys by their ID and store them in an array. - my @keys = sort { $a <=> $b } keys %dns_servers; # Loop through all entries of the array/hash. foreach my $id (@keys) { diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index b63964081..06aca579b 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3945,7 +3945,13 @@ sub adduser } else { &deluser($str_user); - my $htpasswd = new Apache::Htpasswd("$userdb"); + my %htpasswd_options = ( + passwdFile => "$userdb", + UseMD5 => 1, + ); + + my $htpasswd = new Apache::Htpasswd(\%htpasswd_options); + $htpasswd->htpasswd($str_user, $str_pass); } diff --git a/lfs/ddns b/lfs/ddns index 47817c058..0e045ddc4 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@ include Config -VER = 012 +VER = 013 THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 00e70e8bf619148e14b6f6836314bbb7 +$(DL_FILE)_MD5 = a988a808a08c810c41964ac6b0febbeb install : $(TARGET) @@ -71,9 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - # Add upstream patch for fixing noip.com - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-012-noip-rename-provider.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-012-noip-fix-handle-name.patch + # Apply upstream patches. + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-013-dyfi-use-https.patch cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ diff --git a/lfs/guardian b/lfs/guardian index a40480c0c..3e2c3347f 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 18 +PAK_VER = 19 DEPS = "perl-inotify2 perl-Net-IP" @@ -79,6 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axvf $(DIR_DL)/$(DL_FILE) + # Add upstream patches. + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/guardian-2.0.2-http-parser.patch + # Adjust path for firewall binaries. cd $(DIR_APP) && sed -i "s|/usr/sbin/|/sbin/|g" modules/IPtables.pm diff --git a/lfs/libpciaccess b/lfs/libpciaccess index 571a71d6f..dd109220c 100644 --- a/lfs/libpciaccess +++ b/lfs/libpciaccess @@ -24,15 +24,15 @@ include Config -VER = 0.13.4 +VER = 0.16 THISAPP = libpciaccess-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libpciaccess -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cc1fad87da60682af1d5fa43a5da45a4 +$(DL_FILE)_MD5 = b34e2cbdd6aa8f9cc3fa613fd401a6d6 install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -75,7 +75,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index cee78a283..884319822 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -212,10 +212,11 @@ import_aws_configuration() { # Save CONFIG_TYPE echo "CONFIG_TYPE=${config_type}" >> /var/ipfire/ethernet/settings - - # Actions performed only on the very first start if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then + # Disable using ISP nameservers + sed -e "s/^USE_ISP_NAMESERVERS=.*/USE_ISP_NAMESERVERS=off/" -i /var/ipfire/dns/settings + # Enable SSH sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup index d84ec3aca..291b8e0a4 100644 --- a/src/initscripts/helper/azure-setup +++ b/src/initscripts/helper/azure-setup @@ -240,6 +240,9 @@ import_azure_configuration() { # Actions performed only on the very first start if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then + # Disable using ISP nameservers + sed -e "s/^USE_ISP_NAMESERVERS=.*/USE_ISP_NAMESERVERS=off/" -i /var/ipfire/dns/settings + # Enable SSH sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings diff --git a/src/patches/ddns-012-noip-fix-handle-name.patch b/src/patches/ddns-012-noip-fix-handle-name.patch deleted file mode 100644 index d1d281c34..000000000 --- a/src/patches/ddns-012-noip-fix-handle-name.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit c0277eeea2b2c1ed8f40f1248b28438e44e51912 -Author: Stefan Schantl <stefan.schantl(a)ipfire.org> -Date: Tue Nov 12 08:43:31 2019 +0100 - - NoIP.com: Rename handle back to no-ip.com - - The old handle name is required for backward compatiblity. - - Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> - -diff --git a/ddns.conf.sample b/ddns.conf.sample -index 528684f..61a608a 100644 ---- a/ddns.conf.sample -+++ b/ddns.conf.sample -@@ -120,7 +120,7 @@ - # password = pass - - # [test.noip.org] --# provider = noip.com -+# provider = no-ip.com - # username = user - # password = pass - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index 4789107..661fbcc 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -1344,7 +1344,7 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider): - - - class DDNSProviderNOIP(DDNSProtocolDynDNS2, DDNSProvider): -- handle = "noip.com" -+ handle = "no-ip.com" - name = "NoIP" - website = "http://www.noip.com/" - protocols = ("ipv4",) diff --git a/src/patches/ddns-012-noip-rename-provider.patch b/src/patches/ddns-012-noip-rename-provider.patch deleted file mode 100644 index acc5e66a7..000000000 --- a/src/patches/ddns-012-noip-rename-provider.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit bfdba55a5eeb3dac5ed35ff72b6c74b941da6445 -Author: Stefan Schantl <stefan.schantl(a)ipfire.org> -Date: Tue Nov 5 19:09:53 2019 +0100 - - No-IP.com: Rename provider and handle to NoIP.com - - Fixes #11561. - - Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> - -diff --git a/README b/README -index 76f63bc..c75c448 100644 ---- a/README -+++ b/README -@@ -75,7 +75,7 @@ SUPPORTED PROVIDERS: - loopia.se - myonlineportal.net - namecheap.com -- no-ip.com -+ noip.com - now-dns.com - nsupdate.info - opendns.com -diff --git a/ddns.conf.sample b/ddns.conf.sample -index 5b3b845..528684f 100644 ---- a/ddns.conf.sample -+++ b/ddns.conf.sample -@@ -119,8 +119,8 @@ - # provider = namecheap.com - # password = pass - --# [test.no-ip.org] --# provider = no-ip.com -+# [test.noip.org] -+# provider = noip.com - # username = user - # password = pass - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index f3c62c1..4789107 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -1344,16 +1344,16 @@ class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider): - - - class DDNSProviderNOIP(DDNSProtocolDynDNS2, DDNSProvider): -- handle = "no-ip.com" -- name = "No-IP" -- website = "http://www.no-ip.com/" -+ handle = "noip.com" -+ name = "NoIP" -+ website = "http://www.noip.com/" - protocols = ("ipv4",) - - # Information about the format of the HTTP request is to be found -- # here: http://www.no-ip.com/integrate/request and -- # here: http://www.no-ip.com/integrate/response -+ # here: http://www.noip.com/integrate/request and -+ # here: http://www.noip.com/integrate/response - -- url = "http://dynupdate.no-ip.com/nic/update" -+ url = "http://dynupdate.noip.com/nic/update" - - def prepare_request_data(self, proto): - assert proto == "ipv4" diff --git a/src/patches/ddns-013-dyfi-use-https.patch b/src/patches/ddns-013-dyfi-use-https.patch new file mode 100644 index 000000000..f131c5b24 --- /dev/null +++ b/src/patches/ddns-013-dyfi-use-https.patch @@ -0,0 +1,22 @@ +commit ce6e977f0ace7fe468411270ad07f1824a3aeaec +Author: Mauno Pirnes <mauno.pirnes(a)hotmail.com> +Date: Fri Feb 7 12:25:00 2020 +0100 + + dy.fi: Use HTTPS to perform updates. + + Signed-off-by: Mauno Pirnes <mauno.pirnes(a)hotmail.com> + Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> + +diff --git a/src/ddns/providers.py b/src/ddns/providers.py +index dcdc5da..f1fed22 100644 +--- a/src/ddns/providers.py ++++ b/src/ddns/providers.py +@@ -826,7 +826,7 @@ class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider): + # https://www.dy.fi/page/clients?lang=en + # https://www.dy.fi/page/specification?lang=en + +- url = "http://www.dy.fi/nic/update" ++ url = "https://www.dy.fi/nic/update" + + # Please only send automatic updates when your IP address changes, + # or once per 5 to 6 days to refresh the address mapping (they will diff --git a/src/patches/guardian-2.0.2-http-parser.patch b/src/patches/guardian-2.0.2-http-parser.patch new file mode 100644 index 000000000..1ecae658c --- /dev/null +++ b/src/patches/guardian-2.0.2-http-parser.patch @@ -0,0 +1,45 @@ +commit 5028c7fde1fa15e4960f2fec3c025d0338382895 +Author: Stefan Schantl <stefan.schantl(a)ipfire.org> +Date: Tue Feb 4 07:55:48 2020 +0100 + + Parser: Adjust HTTP parser to be compatible with newer log format. + + Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> + +diff --git a/modules/Parser.pm b/modules/Parser.pm +index 3880228..bcca88f 100644 +--- a/modules/Parser.pm ++++ b/modules/Parser.pm +@@ -302,7 +302,7 @@ sub message_parser_httpd (@) { + # been passed. + foreach my $line (@message) { + # This will catch brute-force attacks against htaccess logins (username). +- if ($line =~ /.*\[error\] \[client (.*)\] user(.*) not found:.*/) { ++ if ($line =~ /.*\[client (.*)\] .* user(.*) not found:.*/) { + # Store the grabbed IP-address. + $address = $1; + +@@ -311,7 +311,7 @@ sub message_parser_httpd (@) { + } + + # Detect htaccess password brute-forcing against a username. +- elsif ($line =~ /.*\[error\] \[client (.*)\] user(.*): authentication failure for.*/) { ++ elsif ($line =~ /.*\[client (.*)\] .* user(.*): authentication failure for.*/) { + # Store the extracted IP-address. + $address = $1; + +@@ -321,6 +321,14 @@ sub message_parser_httpd (@) { + + # Check if at least the IP-address information has been extracted. + if (defined ($address)) { ++ # Check if the address also contains a port value. ++ if ($address =~ m/:/) { ++ my ($add_address, $port) = split(/:/, $address); ++ ++ # Only process the address. ++ $address = $add_address; ++ } ++ + # Add the extracted values and event message to the actions array. + push(@actions, "count $address $name $message"); + } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c2c5bad960f03407b79e7b0afce45157363a55d0
by Arne Fitzenreiter 16 Feb '20

16 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c2c5bad960f03407b79e7b0afce45157363a55d0 (commit) via b53d8ae99b8e2f4164824413b2f771ae54dbe9a7 (commit) via 943eab6695bfd0ea20178e44effc97b4b61b0e14 (commit) from 6f57c5e01f161afca2698003c6e9ca724d452953 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c2c5bad960f03407b79e7b0afce45157363a55d0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 16 15:33:35 2020 +0000 core142: add udev network-hotplug-bridges script to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b53d8ae99b8e2f4164824413b2f771ae54dbe9a7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 14 13:48:19 2020 +0000 udev: Set wireless interfaces into AP mode before adding to bridge Wireless interfaces cannot be added to the bridge when they are still running in station mode. At boot time, the interface will be created and it is attempted to attach it to a bridge, which fails. This patch now checks whether the wireless interface is going to be an access point, changes the mode accordingly and then attaches the interface to the bridge. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Tested-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 943eab6695bfd0ea20178e44effc97b4b61b0e14 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 14 13:48:18 2020 +0000 udev: Add more logging to bridge hotplug script Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/142/filelists/files | 1 + config/udev/network-hotplug-bridges | 6 ++++++ 2 files changed, 7 insertions(+) Difference in files: diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files index 63da6beeb..03d6bd379 100644 --- a/config/rootfiles/core/142/filelists/files +++ b/config/rootfiles/core/142/filelists/files @@ -3,6 +3,7 @@ etc/issue srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs etc/suricata/suricata.yaml +lib/udev/network-hotplug-bridges opt/pakfire/etc/pakfire.conf opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/pakfire.cgi diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges index 5144a7712..33d6d65ba 100644 --- a/config/udev/network-hotplug-bridges +++ b/config/udev/network-hotplug-bridges @@ -72,6 +72,7 @@ ZONE=$(detect_zone) # Cannot proceed if we could not find a zone if [ -z "${ZONE}" ]; then + logger "Could not find a bridged zone for ${INTERFACE}" exit 0 fi @@ -92,7 +93,12 @@ case "${MODE}" in #ip link set "${BRIDGE}" up fi + if grep -q "INTERFACE=${INTERFACE}" "/var/ipfire/wlanap/settings" 2>/dev/null; then + iw dev "${INTERFACE}" set type __ap + fi + # Attach the physical device + logger "Attach ${INTERFACE} to ${BRIDGE}" ip link set dev "${INTERFACE}" master "${BRIDGE}" ip link set dev "${INTERFACE}" up ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6f57c5e01f161afca2698003c6e9ca724d452953
by Arne Fitzenreiter 16 Feb '20

16 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 6f57c5e01f161afca2698003c6e9ca724d452953 (commit) from 96bc01c954ba95b2ca800f62353a8f7eb2f1288b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6f57c5e01f161afca2698003c6e9ca724d452953 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 16 12:05:03 2020 +0100 w_scan: Update to 20170107 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/w_scan | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/w_scan b/lfs/w_scan index 369c1554c..ecc196845 100644 --- a/lfs/w_scan +++ b/lfs/w_scan @@ -25,7 +25,7 @@ include Config -VER = 20130331 +VER = 20170107 THISAPP = w_scan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = w_scan -PAK_VER = 5 +PAK_VER = 6 DEPS = "" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dfc14a4707321e068a594d6899398df8 +$(DL_FILE)_MD5 = c7f9adf92d46b8da5391be80be6fbd72 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 96bc01c954ba95b2ca800f62353a8f7eb2f1288b
by Arne Fitzenreiter 16 Feb '20

16 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 96bc01c954ba95b2ca800f62353a8f7eb2f1288b (commit) from eb7066388b9df1db40afec42a3d4a36a14421994 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 96bc01c954ba95b2ca800f62353a8f7eb2f1288b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 16 16:26:35 2020 +0100 vdradmin: update to 3.6.10 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/vdradmin | 10 ++++------ lfs/vdradmin | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin index 3dba2a03c..379349f65 100644 --- a/config/rootfiles/packages/vdradmin +++ b/config/rootfiles/packages/vdradmin @@ -1,3 +1,4 @@ +etc/rc.d/init.d/vdradmin #etc/vdradmin etc/vdradmin/vdradmind.conf usr/bin/vdradmind @@ -24,6 +25,7 @@ usr/share/locale/de/LC_MESSAGES/vdradmin.mo #usr/share/locale/es/LC_MESSAGES/vdradmin.mo #usr/share/locale/fi/LC_MESSAGES/vdradmin.mo #usr/share/locale/fr/LC_MESSAGES/vdradmin.mo +#usr/share/locale/hu/LC_MESSAGES/vdradmin.mo #usr/share/locale/it/LC_MESSAGES/vdradmin.mo #usr/share/locale/nl/LC_MESSAGES/vdradmin.mo #usr/share/locale/ru/LC_MESSAGES/vdradmin.mo @@ -174,12 +176,8 @@ usr/share/vdradmin #usr/share/vdradmin/template/default/timer_new.html #usr/share/vdradmin/template/default/tv.html #usr/share/vdradmin/template/default/vdr_cmds.html -etc/rc.d/init.d/vdradmin +var/cache/vdradmin +var/log/vdradmin etc/rc.d/rc0.d/K01vdradmin etc/rc.d/rc6.d/K01vdradmin etc/rc.d/rc3.d/S99vdradmin -#usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo -#usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo -var/cache/vdradmin -var/log/vdradmin -#var/run/vdradmin diff --git a/lfs/vdradmin b/lfs/vdradmin index a78919f7e..de9680b1b 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -25,7 +25,7 @@ include Config -VER = 3.6.9 +VER = 3.6.10 THISAPP = vdradmin-am-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdradmin -PAK_VER = 5 +PAK_VER = 6 DEPS = "perl-gettext vdr vdr_epgsearch" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d5cd89325f5a5dca5846a905b17d0bc2 +$(DL_FILE)_MD5 = 467ff4a482be2a5331ad4224a1cb9d8e install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. eb7066388b9df1db40afec42a3d4a36a14421994
by Arne Fitzenreiter 16 Feb '20

16 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via eb7066388b9df1db40afec42a3d4a36a14421994 (commit) from 06fc566a0aea5c4a5e45c4ddc0233fa008375ff2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit eb7066388b9df1db40afec42a3d4a36a14421994 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 16 11:48:22 2020 +0100 vdr: update to 2.4.1 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../packages/{armv5tel => aarch64}/vdr_dvbapi | 2 +- config/rootfiles/packages/armv5tel/vdr_dvbapi | 2 +- config/rootfiles/packages/i586/vdr_dvbapi | 4 +- config/rootfiles/packages/vdr | 5 ++ config/rootfiles/packages/vdr_eepg | 2 +- config/rootfiles/packages/vdr_epgsearch | 8 +-- config/rootfiles/packages/vdr_streamdev | 3 +- config/rootfiles/packages/x86_64/vdr_dvbapi | 2 +- lfs/vdr | 12 ++-- lfs/vdr_dvbapi | 11 ++- lfs/vdr_eepg | 11 ++- lfs/vdr_epgsearch | 17 +++-- lfs/vdr_streamdev | 17 +++-- src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch | 82 ---------------------- src/patches/vdr-epgsearch-2.4.0-debian-paths.patch | 82 ++++++++++++++++++++++ src/patches/vdr-streamdev_recordings-64.patch | 29 -------- 16 files changed, 129 insertions(+), 160 deletions(-) copy config/rootfiles/packages/{armv5tel => aarch64}/vdr_dvbapi (64%) delete mode 100644 src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch create mode 100644 src/patches/vdr-epgsearch-2.4.0-debian-paths.patch delete mode 100644 src/patches/vdr-streamdev_recordings-64.patch Difference in files: diff --git a/config/rootfiles/packages/aarch64/vdr_dvbapi b/config/rootfiles/packages/aarch64/vdr_dvbapi new file mode 100644 index 000000000..2dd21fe99 --- /dev/null +++ b/config/rootfiles/packages/aarch64/vdr_dvbapi @@ -0,0 +1,3 @@ +etc/sysconfig/vdr-plugins.d/dvbapi.conf +etc/vdr/plugins/dvbapi +usr/lib/vdr/libvdr-dvbapi.so.2.4.1 diff --git a/config/rootfiles/packages/armv5tel/vdr_dvbapi b/config/rootfiles/packages/armv5tel/vdr_dvbapi index 074813795..2dd21fe99 100644 --- a/config/rootfiles/packages/armv5tel/vdr_dvbapi +++ b/config/rootfiles/packages/armv5tel/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.0.0 +usr/lib/vdr/libvdr-dvbapi.so.2.4.1 diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi index 5e06c12a4..db2bc1ee6 100644 --- a/config/rootfiles/packages/i586/vdr_dvbapi +++ b/config/rootfiles/packages/i586/vdr_dvbapi @@ -1,4 +1,4 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.0.0 -usr/lib/vdr/libvdr-dvbapi.so.2.0.0-sse +usr/lib/vdr/libvdr-dvbapi.so.2.4.1 +usr/lib/vdr/libvdr-dvbapi.so.2.4.1-sse diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr index 4b6eaffe2..b08f1f04d 100644 --- a/config/rootfiles/packages/vdr +++ b/config/rootfiles/packages/vdr @@ -5,7 +5,9 @@ etc/rc.d/rc6.d/K40vdr etc/sysconfig/vdr #etc/sysconfig/vdr-plugins.d etc/vdr +etc/vdr/camresponses.conf etc/vdr/channels.conf +etc/vdr/conf.d etc/vdr/diseqc.conf etc/vdr/keymacros.conf etc/vdr/scr.conf @@ -19,6 +21,7 @@ usr/bin/svdrpsend #usr/include/libsi/si.h #usr/include/libsi/util.h #usr/include/vdr +#usr/include/vdr/args.h #usr/include/vdr/audio.h #usr/include/vdr/channels.h #usr/include/vdr/ci.h @@ -42,12 +45,14 @@ usr/bin/svdrpsend #usr/include/vdr/lirc.h #usr/include/vdr/menu.h #usr/include/vdr/menuitems.h +#usr/include/vdr/mtd.h #usr/include/vdr/nit.h #usr/include/vdr/osd.h #usr/include/vdr/osdbase.h #usr/include/vdr/pat.h #usr/include/vdr/player.h #usr/include/vdr/plugin.h +#usr/include/vdr/positioner.h #usr/include/vdr/receiver.h #usr/include/vdr/recorder.h #usr/include/vdr/recording.h diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg index 17f7bc4af..8355a4614 100644 --- a/config/rootfiles/packages/vdr_eepg +++ b/config/rootfiles/packages/vdr_eepg @@ -1,2 +1,2 @@ etc/vdr/plugins/eepg -usr/lib/vdr/libvdr-eepg.so.2.0.0 +usr/lib/vdr/libvdr-eepg.so.2.4.1 diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch index 193d79f9c..2402626dd 100644 --- a/config/rootfiles/packages/vdr_epgsearch +++ b/config/rootfiles/packages/vdr_epgsearch @@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf etc/vdr/plugins/epgsearch etc/vdr/plugins/epgsearch/conf.d usr/bin/createcats -usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.0 -usr/lib/vdr/libvdr-epgsearch.so.2.0.0 -usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0 -usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0 +usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.1 +usr/lib/vdr/libvdr-epgsearch.so.2.4.1 +usr/lib/vdr/libvdr-epgsearchonly.so.2.4.1 +usr/lib/vdr/libvdr-quickepgsearch.so.2.4.1 #var/lib/vdr #var/lib/vdr/data var/lib/vdr/data/epgsearch diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev index 458e7d810..bd17db85c 100644 --- a/config/rootfiles/packages/vdr_streamdev +++ b/config/rootfiles/packages/vdr_streamdev @@ -2,7 +2,6 @@ etc/sysconfig/vdr-plugins.d/streamdev-server.conf #etc/vdr/plugins etc/vdr/plugins/streamdev-server etc/vdr/plugins/streamdev-server/streamdevhosts.conf -#usr/lib/vdr #usr/lib/vdr/bin usr/lib/vdr/bin/externremux.sh -usr/lib/vdr/libvdr-streamdev-server.so.2.0.0 +usr/lib/vdr/libvdr-streamdev-server.so.2.4.1 diff --git a/config/rootfiles/packages/x86_64/vdr_dvbapi b/config/rootfiles/packages/x86_64/vdr_dvbapi index 074813795..2dd21fe99 100644 --- a/config/rootfiles/packages/x86_64/vdr_dvbapi +++ b/config/rootfiles/packages/x86_64/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.0.0 +usr/lib/vdr/libvdr-dvbapi.so.2.4.1 diff --git a/lfs/vdr b/lfs/vdr index f82df19fe..d444ae935 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -24,11 +24,11 @@ include Config -VER = 2.0.5 +VER = 2.4.1 # VDRPLUGVER must match with APIVERSION in config.h # after change this update also all vdr plugins -VDRPLUGVER = 2.0.0 +VDRPLUGVER = 2.4.1 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -37,9 +37,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 9 - -SUP_ARCH = none +PAK_VER = 10 DEPS = "vdr_streamdev" @@ -67,7 +65,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f58b9836a60440fde84480a2e37ee91d +$(DL_FILE)_MD5 = b2897fe6b6e6711d512a69642b1b8ec1 install : $(TARGET) diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi index d11a4b4dd..eed576124 100644 --- a/lfs/vdr_dvbapi +++ b/lfs/vdr_dvbapi @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -24,8 +24,7 @@ include Config -VER = 1.0.6 -SUP_ARCHES = +VER = 2.2.5 THISAPP = vdr-plugin-dvbapi-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,11 +33,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_dvbapi -PAK_VER = 1 +PAK_VER = 2 DEPS = "" -VDRPLUGVER = 2.0.0 +VDRPLUGVER = 2.4.1 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -70,7 +69,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6a8024b2970beba8eadc1acaa86805e7 +$(DL_FILE)_MD5 = cf35ed8a787c09676338ec16d231b61a install : $(TARGET) diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg index 4a3f811d8..75c70d521 100644 --- a/lfs/vdr_eepg +++ b/lfs/vdr_eepg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -24,9 +24,8 @@ include Config -GIT_VER = 69b47ba4bf0195fd6820beb2cf4f7c7ea31f4011 +GIT_VER = 32b4e669bf8bc6e3336073616c121f10b8518fe8 VER = master -SUP_ARCHES = THISAPP = vdr-plugin-eepg-$(VER) DL_FILE = vdr-plugin-eepg-$(GIT_VER).tar.bz2 @@ -37,11 +36,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_eepg -PAK_VER = 1 +PAK_VER = 2 DEPS = "" -VDRPLUGVER = 2.0.0 +VDRPLUGVER = 2.4.1 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -55,7 +54,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0d8049949263f9a2b8deb2ae9919bc49 +$(DL_FILE)_MD5 = 53c5ec7358da2ce740a764f9d429d96f install : $(TARGET) diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch index 1a202b34b..7836d7c7d 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr_epgsearch @@ -24,21 +24,20 @@ include Config -VER = 1.0.1.beta5 -SUP_ARCHES = +VER = 2.4.0+git20191101 -THISAPP = vdr-epgsearch-$(VER) -DL_FILE = $(THISAPP).tgz +THISAPP = vdr-plugin-epgsearch_$(VER).orig +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/epgsearch-$(VER) +DIR_APP = $(DIR_SRC)/vdr-plugin-epgsearch TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_epgsearch -PAK_VER = 7 +PAK_VER = 8 DEPS = "" -VDRPLUGVER = 2.0.0 +VDRPLUGVER = 2.4.1 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -52,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6e63cc29df02f48fabf6e12e1e71b2fc +$(DL_FILE)_MD5 = cf7e8ca02af3068df2fa71c026c92390 install : $(TARGET) @@ -85,7 +84,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch + cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev index c6d21f110..9e4cf7bdc 100644 --- a/lfs/vdr_streamdev +++ b/lfs/vdr_streamdev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -25,21 +25,20 @@ include Config VER = 0.6.1 -GIT_VER = 10db11ac -SUP_ARCHES = +GIT_VER = e2a9b979d3fb92967c7a6a8221e674eb7e55c813 -THISAPP = vdr-streamdev-$(GIT_VER) -DL_FILE = $(THISAPP).tar.xz +THISAPP = vdr-plugin-streamdev-$(GIT_VER) +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_streamdev -PAK_VER = 2 +PAK_VER = 3 DEPS = "" -VDRPLUGVER = 2.0.0 +VDRPLUGVER = 2.4.1 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -53,7 +52,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e5011fd1a4b0624b192911f37c6040e3 +$(DL_FILE)_MD5 = 2ac0a951d47808d00e97d42d59182e36 install : $(TARGET) @@ -87,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-streamdev_recordings-64.patch +# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-streamdev_recordings-64.patch cd $(DIR_APP) && sed -i 's@$(VDRDIR)/device.h@/usr/include/vdr/device.h@' Makefile cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ diff --git a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch deleted file mode 100644 index d8319c0af..000000000 --- a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -up epgsearch-1.0.1.beta2/epgsearch.c~ epgsearch-1.0.1.beta2/epgsearch.c ---- epgsearch-1.0.1.beta2/epgsearch.c~ 2012-06-11 20:01:54.000000000 +0300 -+++ epgsearch-1.0.1.beta2/epgsearch.c 2012-06-12 22:20:38.740086339 +0300 -@@ -446,16 +446,16 @@ bool cPluginEpgsearch::Start(void) - LoadConfD(); - LoadUserVars(); - -- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true); -- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf")); -- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf")); -- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf")); -- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data")); -- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf")); -- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf")); -- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf")); -- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf")); -- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf")); -+ ChannelGroups.Load("/var/lib/vdr/data/epgsearch/epgsearchchangrps.conf", true); -+ Blacklists.Load("/var/lib/vdr/data/epgsearch/epgsearchblacklists.conf"); -+ SearchExts.Load("/var/lib/vdr/data/epgsearch/epgsearch.conf"); -+ SearchTemplates.Load("/var/lib/vdr/data/epgsearch/epgsearchtemplates.conf"); -+ RecsDone.Load("/var/lib/vdr/data/epgsearch/epgsearchdone.data"); -+ SwitchTimers.Load("/var/lib/vdr/data/epgsearch/epgsearchswitchtimers.conf"); -+ NoAnnounces.Load("/var/lib/vdr/data/epgsearch/noannounce.conf"); -+ DefTimerCheckModes.Load("/var/lib/vdr/data/epgsearch/deftimerchkmodes.conf"); -+ TimersDone.Load("/var/lib/vdr/data/epgsearch/timersdone.conf"); -+ PendingNotifications.Load("/var/lib/vdr/data/epgsearch/pendingnotifications.conf"); - - cSearchTimerThread::Init(this); - cSwitchTimerThread::Init(); -diff -up epgsearch-1.0.1.beta2/epgsearchcfg.c~ epgsearch-1.0.1.beta2/epgsearchcfg.c ---- epgsearch-1.0.1.beta2/epgsearchcfg.c~ 2012-06-11 19:43:52.000000000 +0300 -+++ epgsearch-1.0.1.beta2/epgsearchcfg.c 2012-06-12 22:20:39.169055465 +0300 -@@ -80,7 +80,7 @@ cEPGSearchConfig::cEPGSearchConfig(void) - strcpy(MailAuthUser, ""); - strcpy(MailAuthPass, ""); - strcpy(LastMailConflicts, ""); -- mailViaScript = 1; -+ mailViaScript = 0; - manualTimerCheckDefault = 0; - noAnnounceWhileReplay = 0; - TimerProgRepeat = 0; -diff -up epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ epgsearch-1.0.1.beta2/scripts/recordingdone.sh ---- epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ 2012-06-12 22:19:28.570878733 +0300 -+++ epgsearch-1.0.1.beta2/scripts/recordingdone.sh 2012-06-12 22:20:39.536029167 +0300 -@@ -60,10 +60,10 @@ CTIME_FROM_RECORDING=yes - SVDRPSEND=svdrpsend - - # Home of EPGsearch --EPGSEARCH_HOME="/etc/vdr/plugins" -+EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch" - - # Video root --VIDEO_ROOT="/video" -+VIDEO_ROOT="/var/video" - - # do not edit below this line - #------------------------------------------------------------------------------ -diff -up epgsearch-1.0.1.beta2/scripts/recrep.sh~ epgsearch-1.0.1.beta2/scripts/recrep.sh ---- epgsearch-1.0.1.beta2/scripts/recrep.sh~ 2012-06-11 19:43:51.000000000 +0300 -+++ epgsearch-1.0.1.beta2/scripts/recrep.sh 2012-06-12 22:20:39.914002061 +0300 -@@ -15,7 +15,7 @@ - # adjust the following lines to your config - - # your plugins config dir --PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch -+PLUGINCONFDIR=/etc/vdr/plugins/epgsearch - # path to svdrpsend - SVDRPSEND=svdrpsend - # the key used to call epgsearch -diff -up epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh ---- epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ 2012-06-11 19:43:51.000000000 +0300 -+++ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh 2012-06-12 22:20:40.723944345 +0300 -@@ -15,7 +15,7 @@ - #<Configuration> - - # Your timers.conf --TIMERS="/video/timers.conf" -+TIMERS="/etc/vdr/timers.conf" - - #</Configuration> - diff --git a/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch b/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch new file mode 100644 index 000000000..99b7a8bcf --- /dev/null +++ b/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch @@ -0,0 +1,82 @@ +diff -Naur vdr-plugin-epgsearch.org/epgsearch.c vdr-plugin-epgsearch/epgsearch.c +--- vdr-plugin-epgsearch.org/epgsearch.c 2020-02-16 07:56:33.307310006 +0100 ++++ vdr-plugin-epgsearch/epgsearch.c 2020-02-16 07:50:53.826938247 +0100 +@@ -465,16 +465,16 @@ + LoadConfD(); + LoadUserVars(); + +- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true); +- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf")); +- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf")); +- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf")); +- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data")); +- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf")); +- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf")); +- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf")); +- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf")); +- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf")); ++ ChannelGroups.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchchangrps.conf"), true); ++ Blacklists.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchblacklists.conf")); ++ SearchExts.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearch.conf")); ++ SearchTemplates.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchtemplates.conf")); ++ RecsDone.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchdone.data")); ++ SwitchTimers.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "epgsearchswitchtimers.conf")); ++ NoAnnounces.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "noannounce.conf")); ++ DefTimerCheckModes.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "deftimerchkmodes.conf")); ++ TimersDone.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "timersdone.conf")); ++ PendingNotifications.Load(AddDirectory("/var/lib/vdr/data/epgsearch", "pendingnotifications.conf")); + + cSearchTimerThread::Init(this); + cSwitchTimerThread::Init(); +diff -Naur vdr-plugin-epgsearch.org/epgsearchcfg.c vdr-plugin-epgsearch/epgsearchcfg.c +--- vdr-plugin-epgsearch.org/epgsearchcfg.c 2020-02-16 07:56:33.323310490 +0100 ++++ vdr-plugin-epgsearch/epgsearchcfg.c 2020-02-16 07:51:58.065261524 +0100 +@@ -76,7 +76,7 @@ + strcpy(MailAuthUser, ""); + strcpy(MailAuthPass, ""); + strcpy(LastMailConflicts, ""); +- mailViaScript = 1; ++ mailViaScript = 0; + manualTimerCheckDefault = 0; + noAnnounceWhileReplay = 0; + TimerProgRepeat = 0; +diff -Naur vdr-plugin-epgsearch.org/scripts/recordingdone.sh vdr-plugin-epgsearch/scripts/recordingdone.sh +--- vdr-plugin-epgsearch.org/scripts/recordingdone.sh 2020-02-16 07:56:33.319310370 +0100 ++++ vdr-plugin-epgsearch/scripts/recordingdone.sh 2020-02-16 07:53:37.255598512 +0100 +@@ -60,10 +60,10 @@ + SVDRPSEND=svdrpsend + + # Home of EPGsearch +-EPGSEARCH_HOME="/etc/vdr/plugins" ++EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch" + + # Video root +-VIDEO_ROOT="/video" ++VIDEO_ROOT="/var/video" + + # do not edit below this line + #------------------------------------------------------------------------------ +diff -Naur vdr-plugin-epgsearch.org/scripts/recrep.sh vdr-plugin-epgsearch/scripts/recrep.sh +--- vdr-plugin-epgsearch.org/scripts/recrep.sh 2020-02-16 07:56:33.319310370 +0100 ++++ vdr-plugin-epgsearch/scripts/recrep.sh 2020-02-16 07:54:21.508751492 +0100 +@@ -15,7 +15,7 @@ + # adjust the following lines to your config + + # your plugins config dir +-PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch ++PLUGINCONFDIR=/etc/vdr/plugins/epgsearch + # path to svdrpsend + SVDRPSEND=svdrpsend + # the key used to call epgsearch +diff -Naur vdr-plugin-epgsearch.org/scripts/timercmds-auxinfo.sh vdr-plugin-epgsearch/scripts/timercmds-auxinfo.sh +--- vdr-plugin-epgsearch.org/scripts/timercmds-auxinfo.sh 2020-02-16 07:56:33.319310370 +0100 ++++ vdr-plugin-epgsearch/scripts/timercmds-auxinfo.sh 2020-02-16 07:54:58.685432309 +0100 +@@ -15,7 +15,7 @@ + #<Configuration> + + # Your timers.conf +-TIMERS="/video/timers.conf" ++TIMERS="/etc/vdr/timers.conf" + + #</Configuration> + diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch deleted file mode 100644 index 2dc5250b4..000000000 --- a/src/patches/vdr-streamdev_recordings-64.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur vdr-streamdev-10db11ac.org/server/connectionHTTP.c vdr-streamdev-10db11ac/server/connectionHTTP.c ---- vdr-streamdev-10db11ac.org/server/connectionHTTP.c 2013-02-18 12:43:02.000000000 +0100 -+++ vdr-streamdev-10db11ac/server/connectionHTTP.c 2013-04-29 15:16:40.049168127 +0200 -@@ -455,11 +455,11 @@ - return NULL; - - char *p = NULL; -- unsigned long l = strtoul(FileBase, &p, 0); -+ unsigned long long l = strtoull(FileBase, &p, 0); - if (p != FileBase && l > 0L) { - if (*p == ':') { - // get recording by dev:inode -- unsigned long inode = strtoul(p + 1, &p, 0); -+ unsigned long long inode = strtoull(p + 1, &p, 0); - if (*p == 0 && inode > 0) { - struct stat st; - cThreadLock RecordingsLock(&Recordings); -diff -Naur vdr-streamdev-10db11ac.org/server/menuHTTP.c vdr-streamdev-10db11ac/server/menuHTTP.c ---- vdr-streamdev-10db11ac.org/server/menuHTTP.c 2013-02-18 12:43:02.000000000 +0100 -+++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 15:15:30.352502787 +0200 -@@ -28,7 +28,7 @@ - { - struct stat st; - if (stat(current->FileName(), &st) == 0) -- return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino); -+ return cString::sprintf("%llu:%llu.rec", (unsigned long long) st.st_dev, (unsigned long long) st.st_ino); - return ""; - } - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 06fc566a0aea5c4a5e45c4ddc0233fa008375ff2
by Arne Fitzenreiter 15 Feb '20

15 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 06fc566a0aea5c4a5e45c4ddc0233fa008375ff2 (commit) from ff58943d8ec03f72609c9248b56f549f75baf505 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 06fc566a0aea5c4a5e45c4ddc0233fa008375ff2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 15 17:11:42 2020 +0000 make.sh remove extra PAKFIRE_CORE version for nightly builds this is useless because the new nightly also copies the core updaters to the unstable and testing pakfire trees. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/stage2 | 4 ++-- make.sh | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) Difference in files: diff --git a/lfs/stage2 b/lfs/stage2 index 4b8f0bc81..355aeef54 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -147,6 +147,6 @@ endif # Pakfire -mkdir -pv /opt/pakfire/db/core - echo "$(PAKFIRE_CORE)" > /opt/pakfire/db/core/mine + echo "$(CORE)" > /opt/pakfire/db/core/mine @$(POSTBUILD) diff --git a/make.sh b/make.sh index 98a5cf830..ce5822736 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -27,7 +27,6 @@ SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.25" # Version number CORE="142" # Core Level (Filename) -PAKFIRE_CORE="141" # Core Level (PAKFIRE) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level @@ -557,7 +556,6 @@ enterchroot() { PS1="${PS1}" \ PATH="${PATH}" \ SYSTEM_RELEASE="${SYSTEM_RELEASE}" \ - PAKFIRE_CORE="${PAKFIRE_CORE}" \ PAKFIRE_TREE="${PAKFIRE_TREE}" \ NAME="${NAME}" \ SNAME="${SNAME}" \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ff58943d8ec03f72609c9248b56f549f75baf505
by Arne Fitzenreiter 15 Feb '20

15 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via ff58943d8ec03f72609c9248b56f549f75baf505 (commit) via e0dbe21e095efe06e4649857f52fe674a463db09 (commit) from 2bafcf22ae0796eee0608ed83ad7e2ab5685317a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ff58943d8ec03f72609c9248b56f549f75baf505 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 15 17:06:24 2020 +0000 kernel: cleanup unused kirkwood patches Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e0dbe21e095efe06e4649857f52fe674a463db09 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 15 17:01:02 2020 +0000 u-boot-kirkwood: drop package Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/u-boot-kirkwood | 6 - lfs/u-boot-kirkwood | 115 -- make.sh | 1 - .../linux-3.14.22-kirkwood_legacy_boot.patch | 1563 -------------------- src/patches/linux/linux-4.14.40-kirkwood-dtb.patch | 59 - 5 files changed, 1744 deletions(-) delete mode 100644 config/rootfiles/common/armv5tel/u-boot-kirkwood delete mode 100644 lfs/u-boot-kirkwood delete mode 100644 src/patches/linux-3.14.22-kirkwood_legacy_boot.patch delete mode 100644 src/patches/linux/linux-4.14.40-kirkwood-dtb.patch Difference in files: diff --git a/config/rootfiles/common/armv5tel/u-boot-kirkwood b/config/rootfiles/common/armv5tel/u-boot-kirkwood deleted file mode 100644 index 67af4fc3c..000000000 --- a/config/rootfiles/common/armv5tel/u-boot-kirkwood +++ /dev/null @@ -1,6 +0,0 @@ -#usr/share/u-boot/dreamplug -usr/share/u-boot/dreamplug/u-boot.kwb -#usr/share/u-boot/iconnect -usr/share/u-boot/iconnect/u-boot.kwb -#usr/share/u-boot/icybox -usr/share/u-boot/icybox/u-boot.kwb diff --git a/lfs/u-boot-kirkwood b/lfs/u-boot-kirkwood deleted file mode 100644 index 49f458b28..000000000 --- a/lfs/u-boot-kirkwood +++ /dev/null @@ -1,115 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2018.03 - -THISAPP = u-boot-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kirkwood -SUP_ARCH = armv5tel - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 02922bdf0ee003fe25bfc32749ffdeab - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -dist: - @$(PAK) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - - # Dreamplug - -mkdir -pv /usr/share/u-boot/dreamplug - cd $(DIR_APP) && make CROSS_COMPILE="" dreamplug_config - cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Globalscale Dreamplug - IPFire.org"!' .config - cd $(DIR_APP) && sed -i -e 's!^# CONFIG_CMD_BOOTZ is not set!CONFIG_CMD_BOOTZ=y!' .config - cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" - cd $(DIR_APP) && install -v -m 644 u-boot.kwb \ - /usr/share/u-boot/dreamplug - cd $(DIR_APP) && make distclean - - # ICY-Box 6x20 - -mkdir -pv /usr/share/u-boot/icybox - cd $(DIR_APP) && make CROSS_COMPILE="" ib62x0_config - cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Raidsonic ICY-Box 62x0 - IPFire.org"!' .config - cd $(DIR_APP) && sed -i -e 's!^# CONFIG_CMD_BOOTZ is not set!CONFIG_CMD_BOOTZ=y!' .config - cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" - cd $(DIR_APP) && install -v -m 644 u-boot.kwb \ - /usr/share/u-boot/icybox - cd $(DIR_APP) && make distclean - - # Iomega Iconnect - -mkdir -pv /usr/share/u-boot/iconnect - # Fix crash at env save because this uboot is larger than 512KB - cd $(DIR_APP) && echo "#undef CONFIG_ENV_OFFSET" >> include/configs/iconnect.h - cd $(DIR_APP) && echo "#define CONFIG_ENV_OFFSET 0xC0000" >> include/configs/iconnect.h - cd $(DIR_APP) && make CROSS_COMPILE="" iconnect_config - cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Iomega iConnect - IPFire.org"!' .config - cd $(DIR_APP) && sed -i -e 's!^# CONFIG_CMD_BOOTZ is not set!CONFIG_CMD_BOOTZ=y!' .config - cd $(DIR_APP) && sed -i -e 's!^# CONFIG_HUSH_PARSER is not set!CONFIG_HUSH_PARSER=y!' .config - cd $(DIR_APP) && sed -i -e 's!^CONFIG_MTDPARTS_DEFAULT=.*!CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xC0000@0x0(uboot),0x40000@0xC0000(uboot_env),-@0x100000(rootfs)"!' .config - cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" - cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" u-boot.kwb - cd $(DIR_APP) && install -v -m 644 u-boot.kwb \ - /usr/share/u-boot/iconnect - cd $(DIR_APP) && make distclean - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 855ec30e1..98a5cf830 100755 --- a/make.sh +++ b/make.sh @@ -1537,7 +1537,6 @@ buildipfire() { lfsmake2 parted lfsmake2 swig lfsmake2 u-boot - lfsmake2 u-boot-kirkwood lfsmake2 u-boot-friendlyarm lfsmake2 python-typing lfsmake2 python-m2crypto diff --git a/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch b/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch deleted file mode 100644 index 97b2cc1f2..000000000 --- a/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch +++ /dev/null @@ -1,1563 +0,0 @@ -diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/db88f6281-bp-setup.c linux-3.14.22/arch/arm/mach-kirkwood/db88f6281-bp-setup.c ---- linux-3.14.22.org/arch/arm/mach-kirkwood/db88f6281-bp-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.22/arch/arm/mach-kirkwood/db88f6281-bp-setup.c 2014-11-05 22:07:58.828714499 +0100 -@@ -0,0 +1,108 @@ -+/* -+ * arch/arm/mach-kirkwood/db88f6281-bp-setup.c -+ * -+ * Marvell DB-88F6281-BP Development Board Setup -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/sizes.h> -+#include <linux/platform_device.h> -+#include <linux/mtd/partitions.h> -+#include <linux/ata_platform.h> -+#include <linux/mv643xx_eth.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <mach/kirkwood.h> -+#include <linux/platform_data/mmc-mvsdio.h> -+#include "common.h" -+#include "mpp.h" -+ -+static struct mtd_partition db88f6281_nand_parts[] = { -+ { -+ .name = "u-boot", -+ .offset = 0, -+ .size = SZ_1M -+ }, { -+ .name = "uImage", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = SZ_4M -+ }, { -+ .name = "root", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = MTDPART_SIZ_FULL -+ }, -+}; -+ -+static struct mv643xx_eth_platform_data db88f6281_ge00_data = { -+ .phy_addr = MV643XX_ETH_PHY_ADDR(8), -+}; -+ -+static struct mv_sata_platform_data db88f6281_sata_data = { -+ .n_ports = 2, -+}; -+ -+static struct mvsdio_platform_data db88f6281_mvsdio_data = { -+ .gpio_write_protect = 37, -+ .gpio_card_detect = 38, -+}; -+ -+static unsigned int db88f6281_mpp_config[] __initdata = { -+ MPP0_NF_IO2, -+ MPP1_NF_IO3, -+ MPP2_NF_IO4, -+ MPP3_NF_IO5, -+ MPP4_NF_IO6, -+ MPP5_NF_IO7, -+ MPP18_NF_IO0, -+ MPP19_NF_IO1, -+ MPP37_GPIO, -+ MPP38_GPIO, -+ 0 -+}; -+ -+static void __init db88f6281_init(void) -+{ -+ /* -+ * Basic setup. Needs to be called early. -+ */ -+ kirkwood_init(); -+ kirkwood_mpp_conf(db88f6281_mpp_config); -+ -+ kirkwood_nand_init(ARRAY_AND_SIZE(db88f6281_nand_parts), 25); -+ kirkwood_ehci_init(); -+ kirkwood_ge00_init(&db88f6281_ge00_data); -+ kirkwood_sata_init(&db88f6281_sata_data); -+ kirkwood_uart0_init(); -+ kirkwood_sdio_init(&db88f6281_mvsdio_data); -+} -+ -+static int __init db88f6281_pci_init(void) -+{ -+ if (machine_is_db88f6281_bp()) { -+ u32 dev, rev; -+ -+ kirkwood_pcie_id(&dev, &rev); -+ if (dev == MV88F6282_DEV_ID) -+ kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0); -+ else -+ kirkwood_pcie_init(KW_PCIE0); -+ } -+ return 0; -+} -+subsys_initcall(db88f6281_pci_init); -+ -+MACHINE_START(DB88F6281_BP, "Marvell DB-88F6281-BP Development Board") -+ /* Maintainer: Saeed Bishara <saeed(a)marvell.com> */ -+ .atag_offset = 0x100, -+ .init_machine = db88f6281_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+MACHINE_END -diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dockstar-setup.c linux-3.14.22/arch/arm/mach-kirkwood/dockstar-setup.c ---- linux-3.14.22.org/arch/arm/mach-kirkwood/dockstar-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.22/arch/arm/mach-kirkwood/dockstar-setup.c 2014-11-05 22:07:58.828714499 +0100 -@@ -0,0 +1,111 @@ -+/* -+ * arch/arm/mach-kirkwood/dockstar-setup.c -+ * -+ * Seagate FreeAgent DockStar Setup -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/ata_platform.h> -+#include <linux/mtd/partitions.h> -+#include <linux/mv643xx_eth.h> -+#include <linux/gpio.h> -+#include <linux/leds.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <mach/kirkwood.h> -+#include "common.h" -+#include "mpp.h" -+ -+static struct mtd_partition dockstar_nand_parts[] = { -+ { -+ .name = "u-boot", -+ .offset = 0, -+ .size = SZ_1M -+ }, { -+ .name = "uImage", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = SZ_4M -+ }, { -+ .name = "root", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = MTDPART_SIZ_FULL -+ }, -+}; -+ -+static struct mv643xx_eth_platform_data dockstar_ge00_data = { -+ .phy_addr = MV643XX_ETH_PHY_ADDR(0), -+}; -+ -+static struct gpio_led dockstar_led_pins[] = { -+ { -+ .name = "dockstar:green:health", -+ .default_trigger = "default-on", -+ .gpio = 46, -+ .active_low = 1, -+ }, -+ { -+ .name = "dockstar:orange:misc", -+ .default_trigger = "none", -+ .gpio = 47, -+ .active_low = 1, -+ }, -+}; -+ -+static struct gpio_led_platform_data dockstar_led_data = { -+ .leds = dockstar_led_pins, -+ .num_leds = ARRAY_SIZE(dockstar_led_pins), -+}; -+ -+static struct platform_device dockstar_leds = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev = { -+ .platform_data = &dockstar_led_data, -+ } -+}; -+ -+static unsigned int dockstar_mpp_config[] __initdata = { -+ MPP29_GPIO, /* USB Power Enable */ -+ MPP46_GPIO, /* LED green */ -+ MPP47_GPIO, /* LED orange */ -+ 0 -+}; -+ -+static void __init dockstar_init(void) -+{ -+ /* -+ * Basic setup. Needs to be called early. -+ */ -+ kirkwood_init(); -+ -+ /* setup gpio pin select */ -+ kirkwood_mpp_conf(dockstar_mpp_config); -+ -+ kirkwood_uart0_init(); -+ kirkwood_nand_init(ARRAY_AND_SIZE(dockstar_nand_parts), 25); -+ -+ if (gpio_request(29, "USB Power Enable") != 0 || -+ gpio_direction_output(29, 1) != 0) -+ pr_err("can't set up GPIO 29 (USB Power Enable)\n"); -+ kirkwood_ehci_init(); -+ -+ kirkwood_ge00_init(&dockstar_ge00_data); -+ -+ platform_device_register(&dockstar_leds); -+} -+ -+MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar") -+ .atag_offset = 0x100, -+ .init_machine = dockstar_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+MACHINE_END -diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dreamplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/dreamplug-setup.c ---- linux-3.14.22.org/arch/arm/mach-kirkwood/dreamplug-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.22/arch/arm/mach-kirkwood/dreamplug-setup.c 2014-11-05 22:07:58.833714499 +0100 -@@ -0,0 +1,151 @@ -+/* -+ * arch/arm/mach-kirkwood/dreamplug-setup.c -+ * -+ * Marvell DreamPlug Reference Board Setup -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/mtd/mtd.h> -+#include <linux/mtd/partitions.h> -+#include <linux/ata_platform.h> -+#include <linux/mv643xx_eth.h> -+#include <linux/gpio.h> -+#include <linux/leds.h> -+#include <linux/spi/flash.h> -+#include <linux/spi/spi.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <mach/kirkwood.h> -+#include <linux/platform_data/mmc-mvsdio.h> -+#include "common.h" -+#include "mpp.h" -+ -+static const struct flash_platform_data dreamplug_spi_slave_data = { -+ .type = "mx25l1606e", -+}; -+ -+static struct spi_board_info __initdata dreamplug_spi_slave_info[] = { -+ { -+ .modalias = "m25p80", -+ .platform_data = &dreamplug_spi_slave_data, -+ .irq = -1, -+ .max_speed_hz = 50000000, -+ .bus_num = 0, -+ .chip_select = 0, -+ }, -+}; -+ -+static struct mv643xx_eth_platform_data dreamplug_ge00_data = { -+ .phy_addr = MV643XX_ETH_PHY_ADDR(0), -+}; -+ -+static struct mv643xx_eth_platform_data dreamplug_ge01_data = { -+ .phy_addr = MV643XX_ETH_PHY_ADDR(1), -+}; -+ -+static struct mv_sata_platform_data dreamplug_sata_data = { -+ .n_ports = 1, -+}; -+ -+static struct mvsdio_platform_data dreamplug_mvsdio_data = { -+ /* unfortunately the CD signal has not been connected */ -+}; -+ -+static struct gpio_led dreamplug_led_pins[] = { -+ { -+ .name = "dreamplug:blue:bluetooth", -+ .gpio = 47, -+ .active_low = 1, -+ }, -+ { -+ .name = "dreamplug:green:wlan", -+ .gpio = 48, -+ .active_low = 1, -+ }, -+ { -+ .name = "dreamplug:blue:wlanap", -+ .gpio = 49, -+ .active_low = 1, -+ }, -+}; -+ -+static struct gpio_led_platform_data dreamplug_led_data = { -+ .leds = dreamplug_led_pins, -+ .num_leds = ARRAY_SIZE(dreamplug_led_pins), -+}; -+ -+static struct platform_device dreamplug_leds = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev = { -+ .platform_data = &dreamplug_led_data, -+ } -+}; -+ -+static unsigned int dreamplug_mpp_config[] __initdata = { -+ MPP0_SPI_SCn, -+ MPP1_SPI_MOSI, -+ MPP2_SPI_SCK, -+ MPP3_SPI_MISO, -+ MPP4_GPIO, -+ MPP5_GPO, -+ MPP7_GPO, -+ MPP18_GPO, -+ MPP19_GPO, -+ MPP47_GPIO, /* B_BLED */ -+ MPP48_GPIO, /* W_GLED */ -+ MPP49_GPIO, /* W_BLED */ -+ 0 -+}; -+ -+static void __init dreamplug_legacy_init(void) -+{ -+ /* -+ * Basic setup. Needs to be called early. -+ */ -+ kirkwood_init(); -+ kirkwood_mpp_conf(dreamplug_mpp_config); -+ -+ kirkwood_uart0_init(); -+ -+ spi_register_board_info(dreamplug_spi_slave_info, -+ ARRAY_SIZE(dreamplug_spi_slave_info)); -+ -+ kirkwood_spi_init(); -+ kirkwood_ehci_init(); -+ -+ kirkwood_ge00_init(&dreamplug_ge00_data); -+ kirkwood_ge01_init(&dreamplug_ge01_data); -+ kirkwood_sata_init(&dreamplug_sata_data); -+ kirkwood_sdio_init(&dreamplug_mvsdio_data); -+ -+ platform_device_register(&dreamplug_leds); -+} -+ -+MACHINE_START(DREAMPLUG, "Marvell DreamPlug Reference Board") -+ /* Maintainer: Siddarth Gore <gores <at> marvell.com> */ -+ .atag_offset = 0x100, -+ .init_machine = dreamplug_legacy_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+MACHINE_END -+ -+MACHINE_START(DREAMPLUG1, "Marvell DreamPlug Reference Board") -+ .atag_offset = 0x100, -+ .init_machine = dreamplug_legacy_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+ -+MACHINE_END -diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/guruplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/guruplug-setup.c ---- linux-3.14.22.org/arch/arm/mach-kirkwood/guruplug-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.22/arch/arm/mach-kirkwood/guruplug-setup.c 2014-11-05 22:07:58.838714499 +0100 -@@ -0,0 +1,135 @@ -+/* -+ * arch/arm/mach-kirkwood/guruplug-setup.c -+ * -+ * Marvell GuruPlug Reference Board Setup -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/mtd/mtd.h> -+#include <linux/mtd/partitions.h> -+#include <linux/ata_platform.h> -+#include <linux/mv643xx_eth.h> -+#include <linux/gpio.h> -+#include <linux/leds.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <mach/kirkwood.h> -+#include <linux/platform_data/mmc-mvsdio.h> -+#include "common.h" -+#include "mpp.h" -+ -+static struct mtd_partition guruplug_nand_parts[] = { -+ { -+ .name = "u-boot", -+ .offset = 0, -+ .size = SZ_1M, -+ .mask_flags = MTD_WRITEABLE, /* read only */ -+ }, { -+ .name = "uImage", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = SZ_4M, -+ }, { -+ .name = "root", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = MTDPART_SIZ_FULL, -+ }, -+}; -+ -+static struct mv643xx_eth_platform_data guruplug_ge00_data = { -+ .phy_addr = MV643XX_ETH_PHY_ADDR(0), -+}; -+ -+static struct mv643xx_eth_platform_data guruplug_ge01_data = { -+ .phy_addr = MV643XX_ETH_PHY_ADDR(1), -+}; -+ -+static struct mv_sata_platform_data guruplug_sata_data = { -+ .n_ports = 1, -+}; -+ -+static struct mvsdio_platform_data guruplug_mvsdio_data = { -+ /* unfortunately the CD signal has not been connected */ -+ .gpio_card_detect = -1, -+ .gpio_write_protect = -1, -+}; -+ -+static struct gpio_led guruplug_led_pins[] = { -+ { -+ .name = "guruplug:red:health", -+ .gpio = 46, -+ .active_low = 1, -+ }, -+ { -+ .name = "guruplug:green:health", -+ .gpio = 47, -+ .active_low = 1, -+ }, -+ { -+ .name = "guruplug:red:wmode", -+ .gpio = 48, -+ .active_low = 1, -+ }, -+ { -+ .name = "guruplug:green:wmode", -+ .gpio = 49, -+ .active_low = 1, -+ }, -+}; -+ -+static struct gpio_led_platform_data guruplug_led_data = { -+ .leds = guruplug_led_pins, -+ .num_leds = ARRAY_SIZE(guruplug_led_pins), -+}; -+ -+static struct platform_device guruplug_leds = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev = { -+ .platform_data = &guruplug_led_data, -+ } -+}; -+ -+static unsigned int guruplug_mpp_config[] __initdata = { -+ MPP46_GPIO, /* M_RLED */ -+ MPP47_GPIO, /* M_GLED */ -+ MPP48_GPIO, /* B_RLED */ -+ MPP49_GPIO, /* B_GLED */ -+ 0 -+}; -+ -+static void __init guruplug_init(void) -+{ -+ /* -+ * Basic setup. Needs to be called early. -+ */ -+ kirkwood_init(); -+ kirkwood_mpp_conf(guruplug_mpp_config); -+ -+ kirkwood_uart0_init(); -+ kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25); -+ -+ kirkwood_ehci_init(); -+ kirkwood_ge00_init(&guruplug_ge00_data); -+ kirkwood_ge01_init(&guruplug_ge01_data); -+ kirkwood_sata_init(&guruplug_sata_data); -+ kirkwood_sdio_init(&guruplug_mvsdio_data); -+ -+ platform_device_register(&guruplug_leds); -+} -+ -+MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board") -+ /* Maintainer: Siddarth Gore <gores(a)marvell.com> */ -+ .atag_offset = 0x100, -+ .init_machine = guruplug_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+MACHINE_END -diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/iconnect-setup.c linux-3.14.22/arch/arm/mach-kirkwood/iconnect-setup.c ---- linux-3.14.22.org/arch/arm/mach-kirkwood/iconnect-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.22/arch/arm/mach-kirkwood/iconnect-setup.c 2014-11-05 22:07:58.843714499 +0100 -@@ -0,0 +1,214 @@ -+/* -+ * arch/arm/mach-kirkwood/iconnect-setup.c -+ * -+ * Iomega iConnect Wireless Data Station Board Setup -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/mtd/mtd.h> -+#include <linux/mtd/partitions.h> -+#include <linux/ata_platform.h> -+#include <linux/mv643xx_eth.h> -+#include <linux/gpio.h> -+#include <linux/gpio_keys.h> -+#include <linux/i2c.h> -+#include <linux/input.h> -+#include <linux/leds.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <mach/kirkwood.h> -+#include "common.h" -+#include "mpp.h" -+ -+static struct mtd_partition iconnect_nand_parts[] = { -+ { -+ .name = "u-boot", -+ .offset = 0, -+ .size = SZ_1M, -+ .mask_flags = MTD_WRITEABLE, /* read only */ -+ }, { -+ .name = "uImage", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = 0x440000, -+ }, { -+ .name = "uInit", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = 0x440000, -+ }, { -+ .name = "root", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = MTDPART_SIZ_FULL, -+ }, -+}; -+ -+static struct mv643xx_eth_platform_data iconnect_ge00_data = { -+ .phy_addr = MV643XX_ETH_PHY_ADDR(0xB), -+}; -+ -+static struct gpio_led iconnect_led_pins[] = { -+ { -+ .name = "iconnect:led_level", -+ .default_trigger = "default-on", -+ .gpio = 41, -+ .active_low = 0, -+ }, -+ -+ { -+ .name = "iconnect:blue:power", -+ .default_trigger = "default-on", -+ .gpio = 42, -+ .active_low = 0, -+ }, -+ { -+ .name = "iconnect:red:power", -+ .default_trigger = "none", -+ .gpio = 43, -+ .active_low = 0, -+ }, -+ { -+ .name = "iconnect:blue:usb_1", -+ .default_trigger = "none", -+ .gpio = 44, -+ .active_low = 0, -+ }, -+ { -+ .name = "iconnect:blue:usb_2", -+ .default_trigger = "none", -+ .gpio = 45, -+ .active_low = 0, -+ }, -+ { -+ .name = "iconnect:blue:usb_3", -+ .default_trigger = "none", -+ .gpio = 46, -+ .active_low = 0, -+ }, -+ { -+ .name = "iconnect:blue:usb_4", -+ .default_trigger = "none", -+ .gpio = 47, -+ .active_low = 0, -+ }, -+ { -+ .name = "iconnect:blue:otb", -+ .default_trigger = "none", -+ .gpio = 48, -+ .active_low = 0, -+ }, -+}; -+ -+static struct gpio_led_platform_data iconnect_led_data = { -+ .leds = iconnect_led_pins, -+ .num_leds = ARRAY_SIZE(iconnect_led_pins), -+}; -+ -+static struct platform_device iconnect_leds = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev = { -+ .platform_data = &iconnect_led_data, -+ } -+}; -+ -+static struct gpio_keys_button iconnect_buttons[] = { -+ { -+ .code = KEY_COPY, -+ .gpio = 35, -+ .desc = "OTB Button", -+ .active_low = 1, -+ }, -+ { -+ .code = KEY_RESTART, -+ .gpio = 12, -+ .desc = "Reset", -+ .active_low = 1, -+ }, -+}; -+ -+static struct gpio_keys_platform_data iconnect_button_data = { -+ .buttons = iconnect_buttons, -+ .nbuttons = ARRAY_SIZE(iconnect_buttons), -+}; -+ -+static struct platform_device iconnect_button_device = { -+ .name = "gpio-keys", -+ .id = -1, -+ .num_resources = 0, -+ .dev = { -+ .platform_data = &iconnect_button_data, -+ } -+}; -+ -+static unsigned int iconnect_mpp_config[] __initdata = { -+ MPP0_NF_IO2, -+ MPP1_NF_IO3, -+ MPP2_NF_IO4, -+ MPP3_NF_IO5, -+ MPP4_NF_IO6, -+ MPP5_NF_IO7, -+ MPP18_NF_IO0, -+ MPP19_NF_IO1, -+ MPP12_GPIO, /* Reset Button */ -+ MPP35_GPIO, /* OTB Button */ -+ -+ MPP41_GPIO, /* LED Level */ -+ MPP42_GPIO, /* Power LED blue */ -+ MPP43_GPIO, /* Power LED red */ -+ MPP44_GPIO, /* USB LED 1 */ -+ MPP45_GPIO, /* USB LED 2 */ -+ MPP46_GPIO, /* USB LED 3 */ -+ MPP47_GPIO, /* USB LED 4 */ -+ MPP48_GPIO, /* OTB LED */ -+ 0 -+}; -+ -+static struct i2c_board_info __initdata iconnect_i2c = { -+ I2C_BOARD_INFO("lm63", 0x4c), -+}; -+ -+static void __init iconnect_legacy_init(void) -+{ -+ /* -+ * Basic setup. Needs to be called early. -+ */ -+ kirkwood_init(); -+ kirkwood_mpp_conf(iconnect_mpp_config); -+ -+ kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25); -+ kirkwood_ehci_init(); -+ kirkwood_ge00_init(&iconnect_ge00_data); -+ -+ kirkwood_uart0_init(); -+ platform_device_register(&iconnect_leds); -+ platform_device_register(&iconnect_button_device); -+ -+ kirkwood_i2c_init(); -+ i2c_register_board_info(0, &iconnect_i2c,1); -+} -+ -+static int __init iconnect_pci_init(void) -+{ -+ if (machine_is_iconnect()) { -+ kirkwood_pcie_init(KW_PCIE0); -+ } -+ return 0; -+} -+subsys_initcall(iconnect_pci_init); -+ -+MACHINE_START(ICONNECT, "Iomega iConnect Wireless Data Station") -+ /* Maintainer: Arne Fitzenreiter <arne_f(a)ipfire.org> */ -+ .atag_offset = 0x100, -+ .init_machine = iconnect_legacy_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+ -+MACHINE_END -diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Kconfig linux-3.14.22/arch/arm/mach-kirkwood/Kconfig ---- linux-3.14.22.org/arch/arm/mach-kirkwood/Kconfig 2014-10-15 08:42:04.000000000 +0200 -+++ linux-3.14.22/arch/arm/mach-kirkwood/Kconfig 2014-11-05 22:07:58.848714499 +0100 -@@ -1,3 +1,5 @@ -+ -+ - if ARCH_KIRKWOOD - - menu "Marvell Kirkwood Implementations" -@@ -72,6 +74,83 @@ - Say 'Y' here if you want your kernel to support the - HP t5325 Thin Client. - -+config MACH_DB88F6281_BP -+ bool "Marvell DB-88F6281-BP Development Board" -+ select KIRKWOOD_LEGACY -+ help -+ Say 'Y' here if you want your kernel to support the -+ Marvell DB-88F6281-BP Development Board. -+ -+config MACH_DOCKSTAR -+ bool "Seagate FreeAgent DockStar" -+ select KIRKWOOD_LEGACY -+ help -+ Say 'Y' here if you want your kernel to support the -+ Seagate FreeAgent DockStar. -+ -+config MACH_SHEEVAPLUG -+ bool "Marvell SheevaPlug Reference Board" -+ select KIRKWOOD_LEGACY -+ help -+ Say 'Y' here if you want your kernel to support the -+ Marvell SheevaPlug Reference Board. -+ -+config MACH_ESATA_SHEEVAPLUG -+ bool "Marvell eSATA SheevaPlug Reference Board" -+ select KIRKWOOD_LEGACY -+ help -+ Say 'Y' here if you want your kernel to support the -+ Marvell eSATA SheevaPlug Reference Board. -+ -+config MACH_GURUPLUG -+ bool "Marvell GuruPlug Reference Board" -+ select KIRKWOOD_LEGACY -+ help -+ Say 'Y' here if you want your kernel to support the -+ Marvell GuruPlug Reference Board. -+ -+config MACH_INETSPACE_V2 -+ bool "LaCie Internet Space v2 NAS Board" -+ select KIRKWOOD_LEGACY -+ help -+ Say 'Y' here if you want your kernel to support the -+ LaCie Internet Space v2 NAS. -+ -+config MACH_NETSPACE_MAX_V2 -+ bool "LaCie Network Space Max v2 NAS Board" -+ select KIRKWOOD_LEGACY -+ help -+ Say 'Y' here if you want your kernel to support the -+ LaCie Network Space Max v2 NAS. -+ -+config MACH_NETSPACE_V2 -+ bool "LaCie Network Space v2 NAS Board" -+ select KIRKWOOD_LEGACY -+ help -+ Say 'Y' here if you want your kernel to support the -+ LaCie Network Space v2 NAS. -+ -+config MACH_DREAMPLUG -+ select KIRKWOOD_LEGACY -+ bool "Marvell DreamPlug Reference Board" -+ help -+ Say 'Y' here if you want your kernel to support the -+ Marvell DreamPlug Reference Board. -+ -+config MACH_ICONNECT -+ select KIRKWOOD_LEGACY -+ bool "Iomega iConnect Wireless Data Station" -+ help -+ Say 'Y' here if you want your kernel to support the -+ Iomega iConnect Wireless Data Station. -+ -+config MACH_NAS6210 -+ select KIRKWOOD_LEGACY -+ bool "Raidsonic ICY BOX IB-62x0" -+ help -+ Say 'Y' here if you want your kernel to support the -+ Raidsonic ICY BOX IB-62x0. -+ - config MACH_TS219 - bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS" - select KIRKWOOD_LEGACY -@@ -113,6 +192,7 @@ - Say 'Y' here if you want your kernel to support the - Marvell 88F6281 GTW GE Board (Flattened Device Tree). - -+ - endmenu - - endif -diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile linux-3.14.22/arch/arm/mach-kirkwood/Makefile ---- linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile 2014-10-15 08:42:04.000000000 +0200 -+++ linux-3.14.22/arch/arm/mach-kirkwood/Makefile 2014-11-05 22:09:01.758714529 +0100 -@@ -2,6 +2,15 @@ - obj-$(CONFIG_KIRKWOOD_LEGACY) += irq.o mpp.o - obj-$(CONFIG_PM) += pm.o - -+obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o -+obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o -+obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o -+obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o -+obj-$(CONFIG_MACH_DREAMPLUG) += dreamplug-setup.o -+obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o -+obj-$(CONFIG_MACH_NETSPACE_MAX_V2) += netspace_v2-setup.o lacie_v2-common.o -+obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o -+obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o - obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o - obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o - obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o -@@ -11,6 +20,8 @@ - obj-$(CONFIG_MACH_T5325) += t5325-setup.o - obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o - obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o -+obj-$(CONFIG_MACH_ICONNECT) += iconnect-setup.o -+obj-$(CONFIG_MACH_NAS6210) += nas6210-setup.o - - obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o - obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.o -diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/nas6210-setup.c linux-3.14.22/arch/arm/mach-kirkwood/nas6210-setup.c ---- linux-3.14.22.org/arch/arm/mach-kirkwood/nas6210-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.22/arch/arm/mach-kirkwood/nas6210-setup.c 2014-11-05 22:07:58.858714499 +0100 -@@ -0,0 +1,185 @@ -+/* -+ * arch/arm/mach-kirkwood/nas6210-setup.c -+ * -+ * Raidsonic ICYBOX NAS6210 and 6220 Board Setup -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/mtd/mtd.h> -+#include <linux/mtd/partitions.h> -+#include <linux/ata_platform.h> -+#include <linux/mv643xx_eth.h> -+#include <linux/gpio.h> -+#include <linux/gpio_keys.h> -+#include <linux/i2c.h> -+#include <linux/input.h> -+#include <linux/leds.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <mach/kirkwood.h> -+#include "common.h" -+#include "mpp.h" -+ -+#define NAS6210_GPIO_POWER_OFF 24 -+ -+static struct mtd_partition nas6210_nand_parts[] = { -+ { -+ .name = "u-boot", -+ .offset = 0, -+ .size = SZ_1M, -+ .mask_flags = MTD_WRITEABLE, /* read only */ -+ }, { -+ .name = "uImage", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = (SZ_1M*6), -+ }, { -+ .name = "root", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = MTDPART_SIZ_FULL, -+ }, -+}; -+ -+static struct mv643xx_eth_platform_data nas6210_ge00_data = { -+ .phy_addr = MV643XX_ETH_PHY_ADDR(8), -+}; -+ -+static struct mv_sata_platform_data nas6210_sata_data = { -+ .n_ports = 2, -+}; -+ -+static struct gpio_led nas6210_led_pins[] = { -+ { -+ .name = "nas6210:green:power", -+ .default_trigger = "default-on", -+ .gpio = 25, -+ .active_low = 0, -+ }, -+ { -+ .name = "nas6210:red:power", -+ .default_trigger = "none", -+ .gpio = 22, -+ .active_low = 0, -+ }, -+ { -+ .name = "nas6210:red:usb_copy", -+ .default_trigger = "none", -+ .gpio = 27, -+ .active_low = 0, -+ }, -+}; -+ -+static struct gpio_led_platform_data nas6210_led_data = { -+ .leds = nas6210_led_pins, -+ .num_leds = ARRAY_SIZE(nas6210_led_pins), -+}; -+ -+static struct platform_device nas6210_leds = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev = { -+ .platform_data = &nas6210_led_data, -+ } -+}; -+ -+static struct gpio_keys_button nas6210_buttons[] = { -+ { -+ .code = KEY_COPY, -+ .gpio = 29, -+ .desc = "USB Copy", -+ .active_low = 1, -+ }, -+ { -+ .code = KEY_RESTART, -+ .gpio = 28, -+ .desc = "Reset", -+ .active_low = 1, -+ }, -+}; -+ -+static struct gpio_keys_platform_data nas6210_button_data = { -+ .buttons = nas6210_buttons, -+ .nbuttons = ARRAY_SIZE(nas6210_buttons), -+}; -+ -+static struct platform_device nas6210_button_device = { -+ .name = "gpio-keys", -+ .id = -1, -+ .num_resources = 0, -+ .dev = { -+ .platform_data = &nas6210_button_data, -+ } -+}; -+ -+static unsigned int nas6210_mpp_config[] __initdata = { -+ MPP0_NF_IO2, -+ MPP1_NF_IO3, -+ MPP2_NF_IO4, -+ MPP3_NF_IO5, -+ MPP4_NF_IO6, -+ MPP5_NF_IO7, -+ MPP18_NF_IO0, -+ MPP19_NF_IO1, -+ MPP22_GPIO, /* Power LED red */ -+ MPP24_GPIO, /* Power off */ -+ MPP25_GPIO, /* Power LED green */ -+ MPP27_GPIO, /* USB transfer LED */ -+ MPP28_GPIO, /* Reset button */ -+ MPP29_GPIO, /* USB Copy button */ -+ 0 -+}; -+ -+void nas6210_power_off(void) -+{ -+ gpio_set_value(NAS6210_GPIO_POWER_OFF, 1); -+ while(1); -+} -+ -+static void __init nas6210_init(void) -+{ -+ /* -+ * Basic setup. Needs to be called early. -+ */ -+ kirkwood_init(); -+ kirkwood_mpp_conf(nas6210_mpp_config); -+ -+ kirkwood_nand_init(ARRAY_AND_SIZE(nas6210_nand_parts), 25); -+ kirkwood_ehci_init(); -+ kirkwood_ge00_init(&nas6210_ge00_data); -+ kirkwood_sata_init(&nas6210_sata_data); -+ kirkwood_uart0_init(); -+ platform_device_register(&nas6210_leds); -+ platform_device_register(&nas6210_button_device); -+ -+ if (gpio_request(NAS6210_GPIO_POWER_OFF, "power-off") == 0 && -+ gpio_direction_output(NAS6210_GPIO_POWER_OFF, 0) == 0) -+ pm_power_off = nas6210_power_off; -+ -+ else -+ pr_err("nas6210: failed to configure power-off gpio pin"); -+} -+ -+static int __init nas6210_pci_init(void) -+{ -+ if (machine_is_nas6210()) { -+ kirkwood_pcie_init(KW_PCIE0); -+ } -+ return 0; -+} -+subsys_initcall(nas6210_pci_init); -+ -+MACHINE_START(NAS6210, "RaidSonic ICY BOX IB-NAS62x0") -+ /* Maintainer: Arne Fitzenreiter <arne_f(a)ipfire.org> */ -+ .atag_offset = 0x00000100, -+ .init_machine = nas6210_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+MACHINE_END -diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/netspace_v2-setup.c linux-3.14.22/arch/arm/mach-kirkwood/netspace_v2-setup.c ---- linux-3.14.22.org/arch/arm/mach-kirkwood/netspace_v2-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.22/arch/arm/mach-kirkwood/netspace_v2-setup.c 2014-11-05 22:07:58.858714499 +0100 -@@ -0,0 +1,293 @@ -+/* -+ * arch/arm/mach-kirkwood/netspace_v2-setup.c -+ * -+ * LaCie Network Space v2 board setup -+ * -+ * Copyright (C) 2009 Simon Guinot <sguinot(a)lacie.com> -+ * Copyright (C) 2009 BenoÃ®t Canet <benoit.canet(a)gmail.com> -+ * -+ * 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. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/ata_platform.h> -+#include <linux/mv643xx_eth.h> -+#include <linux/input.h> -+#include <linux/gpio.h> -+#include <linux/gpio_keys.h> -+#include <linux/leds.h> -+#include <linux/gpio-fan.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <mach/kirkwood.h> -+#include <linux/platform_data/leds-kirkwood-ns2.h> -+#include "common.h" -+#include "mpp.h" -+#include "lacie_v2-common.h" -+ -+/***************************************************************************** -+ * Ethernet -+ ****************************************************************************/ -+ -+static struct mv643xx_eth_platform_data netspace_v2_ge00_data = { -+ .phy_addr = MV643XX_ETH_PHY_ADDR(8), -+}; -+ -+/***************************************************************************** -+ * SATA -+ ****************************************************************************/ -+ -+static struct mv_sata_platform_data netspace_v2_sata_data = { -+ .n_ports = 2, -+}; -+ -+/***************************************************************************** -+ * GPIO keys -+ ****************************************************************************/ -+ -+#define NETSPACE_V2_PUSH_BUTTON 32 -+ -+static struct gpio_keys_button netspace_v2_buttons[] = { -+ [0] = { -+ .code = KEY_POWER, -+ .gpio = NETSPACE_V2_PUSH_BUTTON, -+ .desc = "Power push button", -+ .active_low = 0, -+ }, -+}; -+ -+static struct gpio_keys_platform_data netspace_v2_button_data = { -+ .buttons = netspace_v2_buttons, -+ .nbuttons = ARRAY_SIZE(netspace_v2_buttons), -+}; -+ -+static struct platform_device netspace_v2_gpio_buttons = { -+ .name = "gpio-keys", -+ .id = -1, -+ .dev = { -+ .platform_data = &netspace_v2_button_data, -+ }, -+}; -+ -+/***************************************************************************** -+ * GPIO LEDs -+ ****************************************************************************/ -+ -+#define NETSPACE_V2_GPIO_RED_LED 12 -+ -+static struct gpio_led netspace_v2_gpio_led_pins[] = { -+ { -+ .name = "ns_v2:red:fail", -+ .gpio = NETSPACE_V2_GPIO_RED_LED, -+ }, -+}; -+ -+static struct gpio_led_platform_data netspace_v2_gpio_leds_data = { -+ .num_leds = ARRAY_SIZE(netspace_v2_gpio_led_pins), -+ .leds = netspace_v2_gpio_led_pins, -+}; -+ -+static struct platform_device netspace_v2_gpio_leds = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev = { -+ .platform_data = &netspace_v2_gpio_leds_data, -+ }, -+}; -+ -+/***************************************************************************** -+ * Dual-GPIO CPLD LEDs -+ ****************************************************************************/ -+ -+#define NETSPACE_V2_GPIO_BLUE_LED_SLOW 29 -+#define NETSPACE_V2_GPIO_BLUE_LED_CMD 30 -+ -+static struct ns2_led netspace_v2_led_pins[] = { -+ { -+ .name = "ns_v2:blue:sata", -+ .cmd = NETSPACE_V2_GPIO_BLUE_LED_CMD, -+ .slow = NETSPACE_V2_GPIO_BLUE_LED_SLOW, -+ }, -+}; -+ -+static struct ns2_led_platform_data netspace_v2_leds_data = { -+ .num_leds = ARRAY_SIZE(netspace_v2_led_pins), -+ .leds = netspace_v2_led_pins, -+}; -+ -+static struct platform_device netspace_v2_leds = { -+ .name = "leds-ns2", -+ .id = -1, -+ .dev = { -+ .platform_data = &netspace_v2_leds_data, -+ }, -+}; -+ -+/***************************************************************************** -+ * GPIO fan -+ ****************************************************************************/ -+ -+/* Designed for fan 40x40x16: ADDA AD0412LB-D50 6000rpm@12v */ -+static struct gpio_fan_speed netspace_max_v2_fan_speed[] = { -+ { 0, 0 }, -+ { 1500, 15 }, -+ { 1700, 14 }, -+ { 1800, 13 }, -+ { 2100, 12 }, -+ { 3100, 11 }, -+ { 3300, 10 }, -+ { 4300, 9 }, -+ { 5500, 8 }, -+}; -+ -+static unsigned netspace_max_v2_fan_ctrl[] = { 22, 7, 33, 23 }; -+ -+static struct gpio_fan_alarm netspace_max_v2_fan_alarm = { -+ .gpio = 25, -+ .active_low = 1, -+}; -+ -+static struct gpio_fan_platform_data netspace_max_v2_fan_data = { -+ .num_ctrl = ARRAY_SIZE(netspace_max_v2_fan_ctrl), -+ .ctrl = netspace_max_v2_fan_ctrl, -+ .alarm = &netspace_max_v2_fan_alarm, -+ .num_speed = ARRAY_SIZE(netspace_max_v2_fan_speed), -+ .speed = netspace_max_v2_fan_speed, -+}; -+ -+static struct platform_device netspace_max_v2_gpio_fan = { -+ .name = "gpio-fan", -+ .id = -1, -+ .dev = { -+ .platform_data = &netspace_max_v2_fan_data, -+ }, -+}; -+ -+/***************************************************************************** -+ * General Setup -+ ****************************************************************************/ -+ -+static unsigned int netspace_v2_mpp_config[] __initdata = { -+ MPP0_SPI_SCn, -+ MPP1_SPI_MOSI, -+ MPP2_SPI_SCK, -+ MPP3_SPI_MISO, -+ MPP4_NF_IO6, -+ MPP5_NF_IO7, -+ MPP6_SYSRST_OUTn, -+ MPP7_GPO, /* Fan speed (bit 1) */ -+ MPP8_TW0_SDA, -+ MPP9_TW0_SCK, -+ MPP10_UART0_TXD, -+ MPP11_UART0_RXD, -+ MPP12_GPO, /* Red led */ -+ MPP14_GPIO, /* USB fuse */ -+ MPP16_GPIO, /* SATA 0 power */ -+ MPP17_GPIO, /* SATA 1 power */ -+ MPP18_NF_IO0, -+ MPP19_NF_IO1, -+ MPP20_SATA1_ACTn, -+ MPP21_SATA0_ACTn, -+ MPP22_GPIO, /* Fan speed (bit 0) */ -+ MPP23_GPIO, /* Fan power */ -+ MPP24_GPIO, /* USB mode select */ -+ MPP25_GPIO, /* Fan rotation fail */ -+ MPP26_GPIO, /* USB device vbus */ -+ MPP28_GPIO, /* USB enable host vbus */ -+ MPP29_GPIO, /* Blue led (slow register) */ -+ MPP30_GPIO, /* Blue led (command register) */ -+ MPP31_GPIO, /* Board power off */ -+ MPP32_GPIO, /* Power button (0 = Released, 1 = Pushed) */ -+ MPP33_GPO, /* Fan speed (bit 2) */ -+ 0 -+}; -+ -+#define NETSPACE_V2_GPIO_POWER_OFF 31 -+ -+static void netspace_v2_power_off(void) -+{ -+ gpio_set_value(NETSPACE_V2_GPIO_POWER_OFF, 1); -+} -+ -+static void __init netspace_v2_init(void) -+{ -+ /* -+ * Basic setup. Needs to be called early. -+ */ -+ kirkwood_init(); -+ kirkwood_mpp_conf(netspace_v2_mpp_config); -+ -+ if (machine_is_netspace_max_v2()) -+ lacie_v2_hdd_power_init(2); -+ else -+ lacie_v2_hdd_power_init(1); -+ -+ kirkwood_ehci_init(); -+ kirkwood_ge00_init(&netspace_v2_ge00_data); -+ kirkwood_sata_init(&netspace_v2_sata_data); -+ kirkwood_uart0_init(); -+ lacie_v2_register_flash(); -+ lacie_v2_register_i2c_devices(); -+ -+ platform_device_register(&netspace_v2_leds); -+ platform_device_register(&netspace_v2_gpio_leds); -+ platform_device_register(&netspace_v2_gpio_buttons); -+ if (machine_is_netspace_max_v2()) -+ platform_device_register(&netspace_max_v2_gpio_fan); -+ -+ if (gpio_request(NETSPACE_V2_GPIO_POWER_OFF, "power-off") == 0 && -+ gpio_direction_output(NETSPACE_V2_GPIO_POWER_OFF, 0) == 0) -+ pm_power_off = netspace_v2_power_off; -+ else -+ pr_err("netspace_v2: failed to configure power-off GPIO\n"); -+} -+ -+#ifdef CONFIG_MACH_NETSPACE_V2 -+MACHINE_START(NETSPACE_V2, "LaCie Network Space v2") -+ .atag_offset = 0x100, -+ .init_machine = netspace_v2_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+MACHINE_END -+#endif -+ -+#ifdef CONFIG_MACH_INETSPACE_V2 -+MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2") -+ .atag_offset = 0x100, -+ .init_machine = netspace_v2_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+MACHINE_END -+#endif -+ -+#ifdef CONFIG_MACH_NETSPACE_MAX_V2 -+MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2") -+ .atag_offset = 0x100, -+ .init_machine = netspace_v2_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+MACHINE_END -+#endif -diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/sheevaplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/sheevaplug-setup.c ---- linux-3.14.22.org/arch/arm/mach-kirkwood/sheevaplug-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.14.22/arch/arm/mach-kirkwood/sheevaplug-setup.c 2014-11-05 22:07:58.868714499 +0100 -@@ -0,0 +1,161 @@ -+/* -+ * arch/arm/mach-kirkwood/sheevaplug-setup.c -+ * -+ * Marvell SheevaPlug Reference Board Setup -+ * -+ * This file is licensed under the terms of the GNU General Public -+ * License version 2. This program is licensed "as is" without any -+ * warranty of any kind, whether express or implied. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/ata_platform.h> -+#include <linux/mtd/partitions.h> -+#include <linux/mv643xx_eth.h> -+#include <linux/gpio.h> -+#include <linux/leds.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <mach/kirkwood.h> -+#include <linux/platform_data/mmc-mvsdio.h> -+#include "common.h" -+#include "mpp.h" -+ -+static struct mtd_partition sheevaplug_nand_parts[] = { -+ { -+ .name = "u-boot", -+ .offset = 0, -+ .size = SZ_1M -+ }, { -+ .name = "uImage", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = SZ_4M -+ }, { -+ .name = "root", -+ .offset = MTDPART_OFS_NXTBLK, -+ .size = MTDPART_SIZ_FULL -+ }, -+}; -+ -+static struct mv643xx_eth_platform_data sheevaplug_ge00_data = { -+ .phy_addr = MV643XX_ETH_PHY_ADDR(0), -+}; -+ -+static struct mv_sata_platform_data sheeva_esata_sata_data = { -+ .n_ports = 2, -+}; -+ -+static struct mvsdio_platform_data sheevaplug_mvsdio_data = { -+ /* unfortunately the CD signal has not been connected */ -+}; -+ -+static struct mvsdio_platform_data sheeva_esata_mvsdio_data = { -+ .gpio_write_protect = 44, /* MPP44 used as SD write protect */ -+ .gpio_card_detect = 47, /* MPP47 used as SD card detect */ -+}; -+ -+static struct gpio_led sheevaplug_led_pins[] = { -+ { -+ .name = "plug:red:misc", -+ .default_trigger = "none", -+ .gpio = 46, -+ .active_low = 1, -+ }, -+ { -+ .name = "plug:green:health", -+ .default_trigger = "default-on", -+ .gpio = 49, -+ .active_low = 1, -+ }, -+}; -+ -+static struct gpio_led_platform_data sheevaplug_led_data = { -+ .leds = sheevaplug_led_pins, -+ .num_leds = ARRAY_SIZE(sheevaplug_led_pins), -+}; -+ -+static struct platform_device sheevaplug_leds = { -+ .name = "leds-gpio", -+ .id = -1, -+ .dev = { -+ .platform_data = &sheevaplug_led_data, -+ } -+}; -+ -+static unsigned int sheevaplug_mpp_config[] __initdata = { -+ MPP29_GPIO, /* USB Power Enable */ -+ MPP46_GPIO, /* LED Red */ -+ MPP49_GPIO, /* LED */ -+ 0 -+}; -+ -+static unsigned int sheeva_esata_mpp_config[] __initdata = { -+ MPP29_GPIO, /* USB Power Enable */ -+ MPP44_GPIO, /* SD Write Protect */ -+ MPP47_GPIO, /* SD Card Detect */ -+ MPP49_GPIO, /* LED Green */ -+ 0 -+}; -+ -+static void __init sheevaplug_init(void) -+{ -+ /* -+ * Basic setup. Needs to be called early. -+ */ -+ kirkwood_init(); -+ -+ /* setup gpio pin select */ -+ if (machine_is_esata_sheevaplug()) -+ kirkwood_mpp_conf(sheeva_esata_mpp_config); -+ else -+ kirkwood_mpp_conf(sheevaplug_mpp_config); -+ -+ kirkwood_uart0_init(); -+ kirkwood_nand_init(ARRAY_AND_SIZE(sheevaplug_nand_parts), 25); -+ -+ if (gpio_request(29, "USB Power Enable") != 0 || -+ gpio_direction_output(29, 1) != 0) -+ pr_err("can't set up GPIO 29 (USB Power Enable)\n"); -+ kirkwood_ehci_init(); -+ -+ kirkwood_ge00_init(&sheevaplug_ge00_data); -+ -+ /* honor lower power consumption for plugs with out eSATA */ -+ if (machine_is_esata_sheevaplug()) -+ kirkwood_sata_init(&sheeva_esata_sata_data); -+ -+ /* enable sd wp and sd cd on plugs with esata */ -+ if (machine_is_esata_sheevaplug()) -+ kirkwood_sdio_init(&sheeva_esata_mvsdio_data); -+ else -+ kirkwood_sdio_init(&sheevaplug_mvsdio_data); -+ -+ platform_device_register(&sheevaplug_leds); -+} -+ -+#ifdef CONFIG_MACH_SHEEVAPLUG -+MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board") -+ /* Maintainer: shadi Ammouri <shadi(a)marvell.com> */ -+ .atag_offset = 0x100, -+ .init_machine = sheevaplug_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+MACHINE_END -+#endif -+ -+#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG -+MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board") -+ .atag_offset = 0x100, -+ .init_machine = sheevaplug_init, -+ .map_io = kirkwood_map_io, -+ .init_early = kirkwood_init_early, -+ .init_irq = kirkwood_init_irq, -+ .init_time = kirkwood_timer_init, -+ .restart = kirkwood_restart, -+MACHINE_END -+#endif -diff -Naur linux-3.14.22.org/arch/arm/tools/mach-types linux-3.14.22/arch/arm/tools/mach-types ---- linux-3.14.22.org/arch/arm/tools/mach-types 2014-10-15 08:42:04.000000000 +0200 -+++ linux-3.14.22/arch/arm/tools/mach-types 2014-11-05 22:07:58.868714499 +0100 -@@ -447,6 +447,7 @@ - smartq5 MACH_SMARTQ5 SMARTQ5 2534 - davinci_dm6467tevm MACH_DAVINCI_DM6467TEVM DAVINCI_DM6467TEVM 2548 - mxt_td60 MACH_MXT_TD60 MXT_TD60 2550 -+guruplug MACH_GURUPLUG GURUPLUG 2601 - capc7117 MACH_CAPC7117 CAPC7117 2612 - icontrol MACH_ICONTROL ICONTROL 2624 - gplugd MACH_GPLUGD GPLUGD 2625 -@@ -454,7 +455,7 @@ - mx23evk MACH_MX23EVK MX23EVK 2629 - ap4evb MACH_AP4EVB AP4EVB 2630 - mityomapl138 MACH_MITYOMAPL138 MITYOMAPL138 2650 --guruplug MACH_GURUPLUG GURUPLUG 2659 -+dreamplug1 MACH_DREAMPLUG1 DREAMPLUG1 2659 - spear310 MACH_SPEAR310 SPEAR310 2660 - spear320 MACH_SPEAR320 SPEAR320 2661 - aquila MACH_AQUILA AQUILA 2676 -@@ -491,6 +492,7 @@ - t5325 MACH_T5325 T5325 2846 - income MACH_INCOME INCOME 2849 - goni MACH_GONI GONI 2862 -+iconnect MACH_ICONNECT ICONNECT 2870 - bv07 MACH_BV07 BV07 2882 - openrd_ultimate MACH_OPENRD_ULTIMATE OPENRD_ULTIMATE 2884 - devixp MACH_DEVIXP DEVIXP 2885 -@@ -520,6 +522,7 @@ - vpr200 MACH_VPR200 VPR200 3087 - torbreck MACH_TORBRECK TORBRECK 3090 - prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 -+nas6210 MACH_NAS6210 NAS6210 3104 - paz00 MACH_PAZ00 PAZ00 3128 - acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129 - ag5evm MACH_AG5EVM AG5EVM 3189 -@@ -544,6 +547,7 @@ - nspire MACH_NSPIRE NSPIRE 3503 - nokia_rm696 MACH_NOKIA_RM696 NOKIA_RM696 3522 - mikrap_x168 MACH_MIKRAP_X168 MIKRAP_X168 3543 -+dreamplug MACH_DREAMPLUG DREAMPLUG 3550 - deto_macarm9 MACH_DETO_MACARM9 DETO_MACARM9 3568 - m28evk MACH_M28EVK M28EVK 3613 - kota2 MACH_KOTA2 KOTA2 3616 diff --git a/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch b/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch deleted file mode 100644 index f3c88205d..000000000 --- a/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts -index 4a512d8..f550bba 100644 ---- a/arch/arm/boot/dts/kirkwood-iconnect.dts -+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts -@@ -5,7 +5,7 @@ - #include "kirkwood-6281.dtsi" - - / { -- model = "Iomega Iconnect"; -+ model = "Iomega iConnect"; - compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood"; - - memory { -@@ -85,37 +85,37 @@ - pinctrl-names = "default"; - - led-level { -- label = "led_level"; -+ label = "iconnect::led_level"; - gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; - default-state = "on"; - }; - power-blue { -- label = "power:blue"; -+ label = "iconnect:blue:power"; - gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; - default-state = "keep"; - }; - power-red { -- label = "power:red"; -+ label = "iconnect:red:power"; - gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; - }; - usb1 { -- label = "usb1:blue"; -+ label = "iconnect:blue:usb_1"; - gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; - }; - usb2 { -- label = "usb2:blue"; -+ label = "iconnect:blue:usb_2"; - gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; - }; - usb3 { -- label = "usb3:blue"; -+ label = "iconnect:blue:usb_3"; - gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; - }; - usb4 { -- label = "usb4:blue"; -+ label = "iconnect:blue:usb_4"; - gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; - }; - otb { -- label = "otb:blue"; -+ label = "iconnect:blue:otb"; - gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; - }; - }; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2bafcf22ae0796eee0608ed83ad7e2ab5685317a
by Arne Fitzenreiter 15 Feb '20

15 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 2bafcf22ae0796eee0608ed83ad7e2ab5685317a (commit) via 28db34f24769e4f01e504b3a2235c1f0813c9308 (commit) via 3c7d55c55a17e33fd4e21d4d22dfb475ace4b571 (commit) via fd1bc1515caa46d7d0540da649de9dec55fb1a1f (commit) via 8485b98d6177606ff7725165e36baa2ca76aa307 (commit) via 65b08a04dade4c549158da776aedc733a26f0c0f (commit) via 7a68b87789e7d857c661ee3ac069fc42f75034f1 (commit) via 962b7f817e2ebb823800e4bc714f68c0b12af3a6 (commit) via d4b31f13d59c9fdc69d367b62c3c28c342940a22 (commit) via bad2292034a61b6edc0fcd8a7ab1510a6626218a (commit) via 674328ea046162b6293adf46996d6126ff5ae0ed (commit) from 09b09b859df6ee460acb28a0c7d5d6a0dfa42a60 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2bafcf22ae0796eee0608ed83ad7e2ab5685317a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:51 2020 +0000 Drop streamripper Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 28db34f24769e4f01e504b3a2235c1f0813c9308 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:49 2020 +0000 Drop rtpproxy This probably has only been used by me and we do not need it any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 3c7d55c55a17e33fd4e21d4d22dfb475ace4b571 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:50 2020 +0000 Drop setserial This package was used internally and we have no script that uses it any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit fd1bc1515caa46d7d0540da649de9dec55fb1a1f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:48 2020 +0000 Drop icegenerator This is only useful with icecast. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8485b98d6177606ff7725165e36baa2ca76aa307 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:47 2020 +0000 Drop icecast This is unmaintained for a very long time. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 65b08a04dade4c549158da776aedc733a26f0c0f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:45 2020 +0000 Drop ez-ipupdate We do not use this at all any more, because it has been replaced by ddns. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 7a68b87789e7d857c661ee3ac069fc42f75034f1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:44 2020 +0000 Drop DirectFB This package is not very useful on its own and nobody seems to pull this as dependency any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 962b7f817e2ebb823800e4bc714f68c0b12af3a6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:43 2020 +0000 Drop check_mk_agent This add-on is unmaintained in IPFire. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d4b31f13d59c9fdc69d367b62c3c28c342940a22 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:42 2020 +0000 Drop multicat & bitstream This reverts commit 0a21ce42e113f6c75f992d4ad1b88812ecc6b150. These packages have never been updated and nodody in the team is willing to support them. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit bad2292034a61b6edc0fcd8a7ab1510a6626218a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:41 2020 +0000 Drop batctl This package is no longer used. BATMAN is slightly out of fashion and can be disabled in our kernel, too. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 674328ea046162b6293adf46996d6126ff5ae0ed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 12 09:34:40 2020 +0000 Drop arm This is a CLI tool for Tor which is no longer maintained upstream. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/batctl | 2 - config/rootfiles/common/bitstream | 138 -- config/rootfiles/common/ez-ipupdate | 1 - config/rootfiles/common/setserial | 2 - config/rootfiles/packages/aarch64/directfb | 391 ----- config/rootfiles/packages/arm | 166 -- config/rootfiles/packages/armv5tel/directfb | 402 ----- config/rootfiles/packages/armv7hl/directfb | 402 ----- config/rootfiles/packages/check_mk_agent | 3 - config/rootfiles/packages/i586/directfb | 397 ----- config/rootfiles/packages/icecast | 55 - config/rootfiles/packages/icegenerator | 1 - config/rootfiles/packages/multicat | 13 - config/rootfiles/packages/rtpproxy | 5 - config/rootfiles/packages/streamripper | 14 - config/rootfiles/packages/x86_64/directfb | 397 ----- lfs/arm | 83 - lfs/batctl | 79 - lfs/bitstream | 84 - lfs/check_mk_agent | 86 - lfs/directfb | 93 -- lfs/ez-ipupdate | 79 - lfs/icecast | 85 - lfs/icegenerator | 85 - lfs/multicat | 84 - lfs/rtpproxy | 87 - lfs/setserial | 77 - lfs/streamripper | 85 - make.sh | 12 - src/initscripts/packages/rtpproxy | 66 - src/paks/check_mk_agent/install.sh | 36 - src/paks/check_mk_agent/uninstall.sh | 35 - src/paks/check_mk_agent/update.sh | 26 - src/paks/rtpproxy/install.sh | 29 - src/paks/rtpproxy/uninstall.sh | 27 - src/paks/rtpproxy/update.sh | 26 - .../DirectFB-1.7.7-add-missing-davinci-files.patch | 1717 -------------------- src/patches/DirectFB-1.7.7-fix_mknod.patch | 22 - src/patches/bitstream-makefile.patch | 7 - .../ez-ipupdate-3.0.11b8-zoneedit-server.patch | 13 - src/patches/ez-ipupdate.formstring.patch | 11 - src/patches/multicat-makefile.patch | 12 - 42 files changed, 5435 deletions(-) delete mode 100644 config/rootfiles/common/batctl delete mode 100644 config/rootfiles/common/bitstream delete mode 100644 config/rootfiles/common/ez-ipupdate delete mode 100644 config/rootfiles/common/setserial delete mode 100644 config/rootfiles/packages/aarch64/directfb delete mode 100644 config/rootfiles/packages/arm delete mode 100644 config/rootfiles/packages/armv5tel/directfb delete mode 100644 config/rootfiles/packages/armv7hl/directfb delete mode 100644 config/rootfiles/packages/check_mk_agent delete mode 100644 config/rootfiles/packages/i586/directfb delete mode 100644 config/rootfiles/packages/icecast delete mode 100644 config/rootfiles/packages/icegenerator delete mode 100644 config/rootfiles/packages/multicat delete mode 100644 config/rootfiles/packages/rtpproxy delete mode 100644 config/rootfiles/packages/streamripper delete mode 100644 config/rootfiles/packages/x86_64/directfb delete mode 100644 lfs/arm delete mode 100644 lfs/batctl delete mode 100644 lfs/bitstream delete mode 100644 lfs/check_mk_agent delete mode 100644 lfs/directfb delete mode 100644 lfs/ez-ipupdate delete mode 100644 lfs/icecast delete mode 100644 lfs/icegenerator delete mode 100644 lfs/multicat delete mode 100644 lfs/rtpproxy delete mode 100644 lfs/setserial delete mode 100644 lfs/streamripper delete mode 100755 src/initscripts/packages/rtpproxy delete mode 100644 src/paks/check_mk_agent/install.sh delete mode 100644 src/paks/check_mk_agent/uninstall.sh delete mode 100644 src/paks/check_mk_agent/update.sh delete mode 100644 src/paks/rtpproxy/install.sh delete mode 100644 src/paks/rtpproxy/uninstall.sh delete mode 100644 src/paks/rtpproxy/update.sh delete mode 100644 src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch delete mode 100644 src/patches/DirectFB-1.7.7-fix_mknod.patch delete mode 100644 src/patches/bitstream-makefile.patch delete mode 100644 src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch delete mode 100644 src/patches/ez-ipupdate.formstring.patch delete mode 100644 src/patches/multicat-makefile.patch Difference in files: diff --git a/config/rootfiles/common/batctl b/config/rootfiles/common/batctl deleted file mode 100644 index a4f49c27e..000000000 --- a/config/rootfiles/common/batctl +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin/batctl -#usr/share/man/man8/batctl.8 diff --git a/config/rootfiles/common/bitstream b/config/rootfiles/common/bitstream deleted file mode 100644 index 583d8f21e..000000000 --- a/config/rootfiles/common/bitstream +++ /dev/null @@ -1,138 +0,0 @@ -#usr/include/bitstream -#usr/include/bitstream/common.h -#usr/include/bitstream/dvb -#usr/include/bitstream/dvb/ci.h -#usr/include/bitstream/dvb/si -#usr/include/bitstream/dvb/si.h -#usr/include/bitstream/dvb/si/bat.h -#usr/include/bitstream/dvb/si/bat_print.h -#usr/include/bitstream/dvb/si/datetime.h -#usr/include/bitstream/dvb/si/desc_40.h -#usr/include/bitstream/dvb/si/desc_41.h -#usr/include/bitstream/dvb/si/desc_42.h -#usr/include/bitstream/dvb/si/desc_43.h -#usr/include/bitstream/dvb/si/desc_44.h -#usr/include/bitstream/dvb/si/desc_45.h -#usr/include/bitstream/dvb/si/desc_46.h -#usr/include/bitstream/dvb/si/desc_47.h -#usr/include/bitstream/dvb/si/desc_48.h -#usr/include/bitstream/dvb/si/desc_49.h -#usr/include/bitstream/dvb/si/desc_4a.h -#usr/include/bitstream/dvb/si/desc_4b.h -#usr/include/bitstream/dvb/si/desc_4c.h -#usr/include/bitstream/dvb/si/desc_4d.h -#usr/include/bitstream/dvb/si/desc_4e.h -#usr/include/bitstream/dvb/si/desc_4f.h -#usr/include/bitstream/dvb/si/desc_50.h -#usr/include/bitstream/dvb/si/desc_51.h -#usr/include/bitstream/dvb/si/desc_52.h -#usr/include/bitstream/dvb/si/desc_53.h -#usr/include/bitstream/dvb/si/desc_54.h -#usr/include/bitstream/dvb/si/desc_55.h -#usr/include/bitstream/dvb/si/desc_56.h -#usr/include/bitstream/dvb/si/desc_57.h -#usr/include/bitstream/dvb/si/desc_58.h -#usr/include/bitstream/dvb/si/desc_59.h -#usr/include/bitstream/dvb/si/desc_5a.h -#usr/include/bitstream/dvb/si/desc_5b.h -#usr/include/bitstream/dvb/si/desc_5c.h -#usr/include/bitstream/dvb/si/desc_5d.h -#usr/include/bitstream/dvb/si/desc_5e.h -#usr/include/bitstream/dvb/si/desc_5f.h -#usr/include/bitstream/dvb/si/desc_60.h -#usr/include/bitstream/dvb/si/desc_61.h -#usr/include/bitstream/dvb/si/desc_62.h -#usr/include/bitstream/dvb/si/desc_63.h -#usr/include/bitstream/dvb/si/desc_64.h -#usr/include/bitstream/dvb/si/desc_65.h -#usr/include/bitstream/dvb/si/desc_66.h -#usr/include/bitstream/dvb/si/desc_67.h -#usr/include/bitstream/dvb/si/desc_68.h -#usr/include/bitstream/dvb/si/desc_69.h -#usr/include/bitstream/dvb/si/desc_6a.h -#usr/include/bitstream/dvb/si/desc_6b.h -#usr/include/bitstream/dvb/si/desc_6c.h -#usr/include/bitstream/dvb/si/desc_6d.h -#usr/include/bitstream/dvb/si/desc_6e.h -#usr/include/bitstream/dvb/si/desc_7a.h -#usr/include/bitstream/dvb/si/desc_7b.h -#usr/include/bitstream/dvb/si/desc_7c.h -#usr/include/bitstream/dvb/si/desc_83p28.h -#usr/include/bitstream/dvb/si/desc_88p28.h -#usr/include/bitstream/dvb/si/descs_list.h -#usr/include/bitstream/dvb/si/dit.h -#usr/include/bitstream/dvb/si/dit_print.h -#usr/include/bitstream/dvb/si/eit.h -#usr/include/bitstream/dvb/si/eit_print.h -#usr/include/bitstream/dvb/si/nit.h -#usr/include/bitstream/dvb/si/nit_print.h -#usr/include/bitstream/dvb/si/numbers.h -#usr/include/bitstream/dvb/si/rst.h -#usr/include/bitstream/dvb/si/rst_print.h -#usr/include/bitstream/dvb/si/sdt.h -#usr/include/bitstream/dvb/si/sdt_print.h -#usr/include/bitstream/dvb/si/sit.h -#usr/include/bitstream/dvb/si/sit_print.h -#usr/include/bitstream/dvb/si/st.h -#usr/include/bitstream/dvb/si/strings.h -#usr/include/bitstream/dvb/si/tdt.h -#usr/include/bitstream/dvb/si/tdt_print.h -#usr/include/bitstream/dvb/si/tot.h -#usr/include/bitstream/dvb/si/tot_print.h -#usr/include/bitstream/dvb/si_print.h -#usr/include/bitstream/dvb/sim.h -#usr/include/bitstream/ietf -#usr/include/bitstream/ietf/rtp.h -#usr/include/bitstream/mpeg -#usr/include/bitstream/mpeg/aac.h -#usr/include/bitstream/mpeg/pes.h -#usr/include/bitstream/mpeg/psi -#usr/include/bitstream/mpeg/psi.h -#usr/include/bitstream/mpeg/psi/cat.h -#usr/include/bitstream/mpeg/psi/cat_print.h -#usr/include/bitstream/mpeg/psi/desc_02.h -#usr/include/bitstream/mpeg/psi/desc_03.h -#usr/include/bitstream/mpeg/psi/desc_04.h -#usr/include/bitstream/mpeg/psi/desc_05.h -#usr/include/bitstream/mpeg/psi/desc_06.h -#usr/include/bitstream/mpeg/psi/desc_07.h -#usr/include/bitstream/mpeg/psi/desc_08.h -#usr/include/bitstream/mpeg/psi/desc_09.h -#usr/include/bitstream/mpeg/psi/desc_0a.h -#usr/include/bitstream/mpeg/psi/desc_0b.h -#usr/include/bitstream/mpeg/psi/desc_0c.h -#usr/include/bitstream/mpeg/psi/desc_0d.h -#usr/include/bitstream/mpeg/psi/desc_0e.h -#usr/include/bitstream/mpeg/psi/desc_0f.h -#usr/include/bitstream/mpeg/psi/desc_10.h -#usr/include/bitstream/mpeg/psi/desc_11.h -#usr/include/bitstream/mpeg/psi/desc_12.h -#usr/include/bitstream/mpeg/psi/desc_1b.h -#usr/include/bitstream/mpeg/psi/desc_1c.h -#usr/include/bitstream/mpeg/psi/desc_1d.h -#usr/include/bitstream/mpeg/psi/desc_1e.h -#usr/include/bitstream/mpeg/psi/desc_1f.h -#usr/include/bitstream/mpeg/psi/desc_20.h -#usr/include/bitstream/mpeg/psi/desc_21.h -#usr/include/bitstream/mpeg/psi/desc_22.h -#usr/include/bitstream/mpeg/psi/desc_23.h -#usr/include/bitstream/mpeg/psi/desc_24.h -#usr/include/bitstream/mpeg/psi/desc_25.h -#usr/include/bitstream/mpeg/psi/desc_26.h -#usr/include/bitstream/mpeg/psi/desc_27.h -#usr/include/bitstream/mpeg/psi/desc_28.h -#usr/include/bitstream/mpeg/psi/desc_2a.h -#usr/include/bitstream/mpeg/psi/desc_2b.h -#usr/include/bitstream/mpeg/psi/desc_2c.h -#usr/include/bitstream/mpeg/psi/descriptors.h -#usr/include/bitstream/mpeg/psi/descs_list.h -#usr/include/bitstream/mpeg/psi/descs_print.h -#usr/include/bitstream/mpeg/psi/pat.h -#usr/include/bitstream/mpeg/psi/pat_print.h -#usr/include/bitstream/mpeg/psi/pmt.h -#usr/include/bitstream/mpeg/psi/pmt_print.h -#usr/include/bitstream/mpeg/psi/psi.h -#usr/include/bitstream/mpeg/psi/tsdt.h -#usr/include/bitstream/mpeg/psi/tsdt_print.h -#usr/include/bitstream/mpeg/psi_print.h -#usr/include/bitstream/mpeg/ts.h diff --git a/config/rootfiles/common/ez-ipupdate b/config/rootfiles/common/ez-ipupdate deleted file mode 100644 index 58125d790..000000000 --- a/config/rootfiles/common/ez-ipupdate +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ez-ipupdate diff --git a/config/rootfiles/common/setserial b/config/rootfiles/common/setserial deleted file mode 100644 index 72fc32ea3..000000000 --- a/config/rootfiles/common/setserial +++ /dev/null @@ -1,2 +0,0 @@ -bin/setserial -#usr/man/man8/setserial.8 diff --git a/config/rootfiles/packages/aarch64/directfb b/config/rootfiles/packages/aarch64/directfb deleted file mode 100644 index a3004e5fa..000000000 --- a/config/rootfiles/packages/aarch64/directfb +++ /dev/null @@ -1,391 +0,0 @@ -usr/bin/dfbdump -usr/bin/dfbdumpinput -usr/bin/dfbfx -usr/bin/dfbg -usr/bin/dfbinfo -usr/bin/dfbinput -usr/bin/dfbinspector -usr/bin/dfblayer -usr/bin/dfbmaster -usr/bin/dfbpenmount -usr/bin/dfbplay -usr/bin/dfbscreen -usr/bin/dfbshow -usr/bin/dfbswitch -usr/bin/directfb-config -usr/bin/directfb-csource -usr/bin/mkdfiff -usr/bin/mkdgiff -usr/bin/mkdgifft -usr/bin/pxa3xx_dump -#usr/include/++dfb -#usr/include/++dfb/++dfb.h -#usr/include/++dfb/++dfb_mangle.h -#usr/include/++dfb/++dfb_unmangle.h -#usr/include/++dfb/idirectfb.h -#usr/include/++dfb/idirectfbdatabuffer.h -#usr/include/++dfb/idirectfbdisplaylayer.h -#usr/include/++dfb/idirectfbeventbuffer.h -#usr/include/++dfb/idirectfbfont.h -#usr/include/++dfb/idirectfbimageprovider.h -#usr/include/++dfb/idirectfbinputdevice.h -#usr/include/++dfb/idirectfbpalette.h -#usr/include/++dfb/idirectfbscreen.h -#usr/include/++dfb/idirectfbsurface.h -#usr/include/++dfb/idirectfbvideoprovider.h -#usr/include/++dfb/idirectfbwindow.h -#usr/include/directfb -#usr/include/directfb-internal -#usr/include/directfb-internal/core -#usr/include/directfb-internal/core/CoreDFB.h -#usr/include/directfb-internal/core/CoreDFB_CallMode.h -#usr/include/directfb-internal/core/CoreDFB_includes.h -#usr/include/directfb-internal/core/CoreGraphicsState.h -#usr/include/directfb-internal/core/CoreGraphicsStateClient.h -#usr/include/directfb-internal/core/CoreGraphicsState_includes.h -#usr/include/directfb-internal/core/CoreInputDevice.h -#usr/include/directfb-internal/core/CoreInputDevice_includes.h -#usr/include/directfb-internal/core/CoreLayer.h -#usr/include/directfb-internal/core/CoreLayerContext.h -#usr/include/directfb-internal/core/CoreLayerContext_includes.h -#usr/include/directfb-internal/core/CoreLayerRegion.h -#usr/include/directfb-internal/core/CoreLayerRegion_includes.h -#usr/include/directfb-internal/core/CoreLayer_includes.h -#usr/include/directfb-internal/core/CorePalette.h -#usr/include/directfb-internal/core/CorePalette_includes.h -#usr/include/directfb-internal/core/CoreScreen.h -#usr/include/directfb-internal/core/CoreScreen_includes.h -#usr/include/directfb-internal/core/CoreSlave.h -#usr/include/directfb-internal/core/CoreSlave_includes.h -#usr/include/directfb-internal/core/CoreSurface.h -#usr/include/directfb-internal/core/CoreSurfaceClient.h -#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h -#usr/include/directfb-internal/core/CoreSurface_includes.h -#usr/include/directfb-internal/core/CoreWindow.h -#usr/include/directfb-internal/core/CoreWindowStack.h -#usr/include/directfb-internal/core/CoreWindowStack_includes.h -#usr/include/directfb-internal/core/CoreWindow_includes.h -#usr/include/directfb-internal/core/Debug.h -#usr/include/directfb-internal/core/DisplayTask.h -#usr/include/directfb-internal/core/Fifo.h -#usr/include/directfb-internal/core/Interface.h -#usr/include/directfb-internal/core/PacketBuffer.h -#usr/include/directfb-internal/core/Renderer.h -#usr/include/directfb-internal/core/SurfaceTask.h -#usr/include/directfb-internal/core/Task.h -#usr/include/directfb-internal/core/TaskManager.h -#usr/include/directfb-internal/core/TaskThreadsQ.h -#usr/include/directfb-internal/core/Util.h -#usr/include/directfb-internal/core/clipboard.h -#usr/include/directfb-internal/core/colorhash.h -#usr/include/directfb-internal/core/core.h -#usr/include/directfb-internal/core/core_parts.h -#usr/include/directfb-internal/core/core_strings.h -#usr/include/directfb-internal/core/core_system.h -#usr/include/directfb-internal/core/coredefs.h -#usr/include/directfb-internal/core/coretypes.h -#usr/include/directfb-internal/core/fonts.h -#usr/include/directfb-internal/core/gfxcard.h -#usr/include/directfb-internal/core/graphics_driver.h -#usr/include/directfb-internal/core/graphics_state.h -#usr/include/directfb-internal/core/input.h -#usr/include/directfb-internal/core/input_driver.h -#usr/include/directfb-internal/core/input_hub.h -#usr/include/directfb-internal/core/layer_context.h -#usr/include/directfb-internal/core/layer_control.h -#usr/include/directfb-internal/core/layer_region.h -#usr/include/directfb-internal/core/layers.h -#usr/include/directfb-internal/core/layers_internal.h -#usr/include/directfb-internal/core/palette.h -#usr/include/directfb-internal/core/screen.h -#usr/include/directfb-internal/core/screens.h -#usr/include/directfb-internal/core/screens_internal.h -#usr/include/directfb-internal/core/state.h -#usr/include/directfb-internal/core/surface.h -#usr/include/directfb-internal/core/surface_allocation.h -#usr/include/directfb-internal/core/surface_buffer.h -#usr/include/directfb-internal/core/surface_client.h -#usr/include/directfb-internal/core/surface_core.h -#usr/include/directfb-internal/core/surface_pool.h -#usr/include/directfb-internal/core/surface_pool_bridge.h -#usr/include/directfb-internal/core/system.h -#usr/include/directfb-internal/core/windows.h -#usr/include/directfb-internal/core/windows_internal.h -#usr/include/directfb-internal/core/windowstack.h -#usr/include/directfb-internal/core/wm.h -#usr/include/directfb-internal/core/wm_module.h -#usr/include/directfb-internal/devmem -#usr/include/directfb-internal/devmem/devmem.h -#usr/include/directfb-internal/devmem/surfacemanager.h -#usr/include/directfb-internal/display -#usr/include/directfb-internal/display/idirectfbdisplaylayer.h -#usr/include/directfb-internal/display/idirectfbpalette.h -#usr/include/directfb-internal/display/idirectfbscreen.h -#usr/include/directfb-internal/display/idirectfbsurface.h -#usr/include/directfb-internal/display/idirectfbsurface_layer.h -#usr/include/directfb-internal/display/idirectfbsurface_window.h -#usr/include/directfb-internal/dummy -#usr/include/directfb-internal/dummy/dummy.h -#usr/include/directfb-internal/fbdev -#usr/include/directfb-internal/fbdev/agp.h -#usr/include/directfb-internal/fbdev/fb.h -#usr/include/directfb-internal/fbdev/fbdev.h -#usr/include/directfb-internal/fbdev/surfacemanager.h -#usr/include/directfb-internal/fbdev/vt.h -#usr/include/directfb-internal/gfx -#usr/include/directfb-internal/gfx/clip.h -#usr/include/directfb-internal/gfx/convert.h -#usr/include/directfb-internal/gfx/generic -#usr/include/directfb-internal/gfx/generic/generic.h -#usr/include/directfb-internal/gfx/util.h -#usr/include/directfb-internal/idirectfb.h -#usr/include/directfb-internal/init.h -#usr/include/directfb-internal/input -#usr/include/directfb-internal/input/idirectfbinputbuffer.h -#usr/include/directfb-internal/input/idirectfbinputdevice.h -#usr/include/directfb-internal/media -#usr/include/directfb-internal/media/idirectfbdatabuffer.h -#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h -#usr/include/directfb-internal/media/idirectfbfont.h -#usr/include/directfb-internal/media/idirectfbimageprovider.h -#usr/include/directfb-internal/media/idirectfbimageprovider_client.h -#usr/include/directfb-internal/media/idirectfbvideoprovider.h -#usr/include/directfb-internal/misc -#usr/include/directfb-internal/misc/conf.h -#usr/include/directfb-internal/misc/gfx_util.h -#usr/include/directfb-internal/misc/util.h -#usr/include/directfb-internal/windows -#usr/include/directfb-internal/windows/idirectfbwindow.h -#usr/include/directfb/dfb_types.h -#usr/include/directfb/dfiff.h -#usr/include/directfb/dgiff.h -#usr/include/directfb/direct -#usr/include/directfb/direct/Lists.h -#usr/include/directfb/direct/LockWQ.h -#usr/include/directfb/direct/Magic.h -#usr/include/directfb/direct/Mutex.h -#usr/include/directfb/direct/Performer.h -#usr/include/directfb/direct/String.h -#usr/include/directfb/direct/TLSObject.h -#usr/include/directfb/direct/ToString.h -#usr/include/directfb/direct/Types++.h -#usr/include/directfb/direct/atomic.h -#usr/include/directfb/direct/build.h -#usr/include/directfb/direct/clock.h -#usr/include/directfb/direct/compiler.h -#usr/include/directfb/direct/conf.h -#usr/include/directfb/direct/debug.h -#usr/include/directfb/direct/direct.h -#usr/include/directfb/direct/fastlz.h -#usr/include/directfb/direct/fifo.h -#usr/include/directfb/direct/filesystem.h -#usr/include/directfb/direct/flz.h -#usr/include/directfb/direct/hash.h -#usr/include/directfb/direct/init.h -#usr/include/directfb/direct/interface.h -#usr/include/directfb/direct/interface_implementation.h -#usr/include/directfb/direct/list.h -#usr/include/directfb/direct/log.h -#usr/include/directfb/direct/log_domain.h -#usr/include/directfb/direct/map.h -#usr/include/directfb/direct/mem.h -#usr/include/directfb/direct/memcpy.h -#usr/include/directfb/direct/messages.h -#usr/include/directfb/direct/modules.h -#usr/include/directfb/direct/os -#usr/include/directfb/direct/os/clock.h -#usr/include/directfb/direct/os/filesystem.h -#usr/include/directfb/direct/os/linux -#usr/include/directfb/direct/os/linux/glibc -#usr/include/directfb/direct/os/linux/glibc/filesystem.h -#usr/include/directfb/direct/os/linux/glibc/mutex.h -#usr/include/directfb/direct/os/linux/glibc/thread.h -#usr/include/directfb/direct/os/linux/glibc/types.h -#usr/include/directfb/direct/os/linux/glibc/waitqueue.h -#usr/include/directfb/direct/os/log.h -#usr/include/directfb/direct/os/mem.h -#usr/include/directfb/direct/os/mutex.h -#usr/include/directfb/direct/os/signals.h -#usr/include/directfb/direct/os/system.h -#usr/include/directfb/direct/os/thread.h -#usr/include/directfb/direct/os/types.h -#usr/include/directfb/direct/os/waitqueue.h -#usr/include/directfb/direct/perf.h -#usr/include/directfb/direct/print.h -#usr/include/directfb/direct/processor.h -#usr/include/directfb/direct/result.h -#usr/include/directfb/direct/serial.h -#usr/include/directfb/direct/signals.h -#usr/include/directfb/direct/stream.h -#usr/include/directfb/direct/system.h -#usr/include/directfb/direct/thread.h -#usr/include/directfb/direct/trace.h -#usr/include/directfb/direct/tree.h -#usr/include/directfb/direct/types.h -#usr/include/directfb/direct/utf8.h -#usr/include/directfb/direct/util.h -#usr/include/directfb/direct/uuid.h -#usr/include/directfb/directfb++.h -#usr/include/directfb/directfb.h -#usr/include/directfb/directfb_build.h -#usr/include/directfb/directfb_graphics.h -#usr/include/directfb/directfb_keyboard.h -#usr/include/directfb/directfb_keynames.h -#usr/include/directfb/directfb_strings.h -#usr/include/directfb/directfb_util.h -#usr/include/directfb/directfb_version.h -#usr/include/directfb/directfb_water.h -#usr/include/directfb/directfb_water_strings.h -#usr/include/directfb/directfb_windows.h -#usr/include/directfb/directfbgl.h -#usr/include/directfb/directfbgl2.h -#usr/include/directfb/fusion -#usr/include/directfb/fusion/Debug.h -#usr/include/directfb/fusion/arena.h -#usr/include/directfb/fusion/build.h -#usr/include/directfb/fusion/call.h -#usr/include/directfb/fusion/conf.h -#usr/include/directfb/fusion/fusion.h -#usr/include/directfb/fusion/fusion_internal.h -#usr/include/directfb/fusion/hash.h -#usr/include/directfb/fusion/init.h -#usr/include/directfb/fusion/lock.h -#usr/include/directfb/fusion/object.h -#usr/include/directfb/fusion/property.h -#usr/include/directfb/fusion/protocol.h -#usr/include/directfb/fusion/reactor.h -#usr/include/directfb/fusion/ref.h -#usr/include/directfb/fusion/shm -#usr/include/directfb/fusion/shm/pool.h -#usr/include/directfb/fusion/shm/shm.h -#usr/include/directfb/fusion/shm/shm_internal.h -#usr/include/directfb/fusion/shmalloc.h -#usr/include/directfb/fusion/types.h -#usr/include/directfb/fusion/vector.h -#usr/lib/directfb-1.7-7 -#usr/lib/directfb-1.7-7/gfxdrivers -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so -#usr/lib/directfb-1.7-7/inputdrivers -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so -#usr/lib/directfb-1.7-7/interfaces -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so -#usr/lib/directfb-1.7-7/interfaces/IWater -#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la -usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so -#usr/lib/directfb-1.7-7/systems -#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la -usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la -usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la -usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la -usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so -#usr/lib/directfb-1.7-7/wm -#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la -usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so -usr/lib/lib++dfb-1.7.so.7 -usr/lib/lib++dfb-1.7.so.7.0.0 -#usr/lib/lib++dfb.la -#usr/lib/lib++dfb.so -usr/lib/libdirect-1.7.so.7 -usr/lib/libdirect-1.7.so.7.0.0 -#usr/lib/libdirect.la -#usr/lib/libdirect.so -usr/lib/libdirectfb-1.7.so.7 -usr/lib/libdirectfb-1.7.so.7.0.0 -#usr/lib/libdirectfb.la -#usr/lib/libdirectfb.so -usr/lib/libfusion-1.7.so.7 -usr/lib/libfusion-1.7.so.7.0.0 -#usr/lib/libfusion.la -#usr/lib/libfusion.so -#usr/lib/pkgconfig/++dfb.pc -#usr/lib/pkgconfig/direct.pc -#usr/lib/pkgconfig/directfb-internal.pc -#usr/lib/pkgconfig/directfb.pc -#usr/lib/pkgconfig/fusion.pc -#usr/share/directfb-1.7.7 -usr/share/directfb-1.7.7/cursor.dat -usr/share/directfb-1.7.7/cursor.png -usr/share/directfb-1.7.7/decker.dgiff -usr/share/directfb-1.7.7/decker.ttf -#usr/share/man/man1/dfbg.1 -#usr/share/man/man1/directfb-csource.1 -#usr/share/man/man5/directfbrc.5 diff --git a/config/rootfiles/packages/arm b/config/rootfiles/packages/arm deleted file mode 100644 index eb9d128d4..000000000 --- a/config/rootfiles/packages/arm +++ /dev/null @@ -1,166 +0,0 @@ -usr/bin/arm -#usr/share/arm -#usr/share/arm-1.4.5.0-py2.7.egg-info -usr/share/arm/TorCtl -usr/share/arm/TorCtl/GeoIPSupport.py -usr/share/arm/TorCtl/GeoIPSupport.pyc -usr/share/arm/TorCtl/PathSupport.py -usr/share/arm/TorCtl/PathSupport.pyc -usr/share/arm/TorCtl/SQLSupport.py -usr/share/arm/TorCtl/SQLSupport.pyc -usr/share/arm/TorCtl/ScanSupport.py -usr/share/arm/TorCtl/ScanSupport.pyc -usr/share/arm/TorCtl/StatsSupport.py -usr/share/arm/TorCtl/StatsSupport.pyc -usr/share/arm/TorCtl/TorCtl.py -usr/share/arm/TorCtl/TorCtl.pyc -usr/share/arm/TorCtl/TorUtil.py -usr/share/arm/TorCtl/TorUtil.pyc -usr/share/arm/TorCtl/__init__.py -usr/share/arm/TorCtl/__init__.pyc -usr/share/arm/TorCtl/example.py -usr/share/arm/TorCtl/example.pyc -usr/share/arm/__init__.py -usr/share/arm/__init__.pyc -usr/share/arm/cli -usr/share/arm/cli/__init__.py -usr/share/arm/cli/__init__.pyc -usr/share/arm/cli/configPanel.py -usr/share/arm/cli/configPanel.pyc -usr/share/arm/cli/connections -usr/share/arm/cli/connections/__init__.py -usr/share/arm/cli/connections/__init__.pyc -usr/share/arm/cli/connections/circEntry.py -usr/share/arm/cli/connections/circEntry.pyc -usr/share/arm/cli/connections/connEntry.py -usr/share/arm/cli/connections/connEntry.pyc -usr/share/arm/cli/connections/connPanel.py -usr/share/arm/cli/connections/connPanel.pyc -usr/share/arm/cli/connections/countPopup.py -usr/share/arm/cli/connections/countPopup.pyc -usr/share/arm/cli/connections/descriptorPopup.py -usr/share/arm/cli/connections/descriptorPopup.pyc -usr/share/arm/cli/connections/entries.py -usr/share/arm/cli/connections/entries.pyc -usr/share/arm/cli/controller.py -usr/share/arm/cli/controller.pyc -usr/share/arm/cli/graphing -usr/share/arm/cli/graphing/__init__.py -usr/share/arm/cli/graphing/__init__.pyc -usr/share/arm/cli/graphing/bandwidthStats.py -usr/share/arm/cli/graphing/bandwidthStats.pyc -usr/share/arm/cli/graphing/connStats.py -usr/share/arm/cli/graphing/connStats.pyc -usr/share/arm/cli/graphing/graphPanel.py -usr/share/arm/cli/graphing/graphPanel.pyc -usr/share/arm/cli/graphing/resourceStats.py -usr/share/arm/cli/graphing/resourceStats.pyc -usr/share/arm/cli/headerPanel.py -usr/share/arm/cli/headerPanel.pyc -usr/share/arm/cli/interpretorPanel.py -usr/share/arm/cli/interpretorPanel.pyc -usr/share/arm/cli/logPanel.py -usr/share/arm/cli/logPanel.pyc -usr/share/arm/cli/menu -usr/share/arm/cli/menu/__init__.py -usr/share/arm/cli/menu/__init__.pyc -usr/share/arm/cli/menu/actions.py -usr/share/arm/cli/menu/actions.pyc -usr/share/arm/cli/menu/item.py -usr/share/arm/cli/menu/item.pyc -usr/share/arm/cli/menu/menu.py -usr/share/arm/cli/menu/menu.pyc -usr/share/arm/cli/popups.py -usr/share/arm/cli/popups.pyc -usr/share/arm/cli/torrcPanel.py -usr/share/arm/cli/torrcPanel.pyc -usr/share/arm/cli/wizard.py -usr/share/arm/cli/wizard.pyc -usr/share/arm/gui -usr/share/arm/gui/__init__.py -usr/share/arm/gui/__init__.pyc -usr/share/arm/gui/arm.xml -usr/share/arm/gui/configPanel.py -usr/share/arm/gui/configPanel.pyc -usr/share/arm/gui/connections -usr/share/arm/gui/connections/__init__.py -usr/share/arm/gui/connections/__init__.pyc -usr/share/arm/gui/connections/circEntry.py -usr/share/arm/gui/connections/circEntry.pyc -usr/share/arm/gui/connections/connEntry.py -usr/share/arm/gui/connections/connEntry.pyc -usr/share/arm/gui/connections/connPanel.py -usr/share/arm/gui/connections/connPanel.pyc -usr/share/arm/gui/controller.py -usr/share/arm/gui/controller.pyc -usr/share/arm/gui/generalPanel.py -usr/share/arm/gui/generalPanel.pyc -usr/share/arm/gui/graphing -usr/share/arm/gui/graphing/__init__.py -usr/share/arm/gui/graphing/__init__.pyc -usr/share/arm/gui/graphing/bandwidthStats.py -usr/share/arm/gui/graphing/bandwidthStats.pyc -usr/share/arm/gui/graphing/graphPanel.py -usr/share/arm/gui/graphing/graphPanel.pyc -usr/share/arm/gui/logPanel.py -usr/share/arm/gui/logPanel.pyc -usr/share/arm/prereq.py -usr/share/arm/prereq.pyc -#usr/share/arm/resources -#usr/share/arm/resources/arm.1 -#usr/share/arm/resources/exitNotice -#usr/share/arm/resources/exitNotice/how_tor_works_thumb.png -#usr/share/arm/resources/exitNotice/index.html -#usr/share/arm/resources/startTor -#usr/share/arm/resources/tor-arm.desktop -#usr/share/arm/resources/tor-arm.svg -#usr/share/arm/resources/torConfigDesc.txt -#usr/share/arm/resources/torrcOverride -#usr/share/arm/resources/torrcOverride/override.c -#usr/share/arm/resources/torrcOverride/override.h -#usr/share/arm/resources/torrcOverride/override.py -#usr/share/arm/resources/torrcTemplate.txt -usr/share/arm/settings.cfg -usr/share/arm/starter.py -usr/share/arm/starter.pyc -usr/share/arm/test.py -usr/share/arm/test.pyc -#usr/share/arm/uninstall -usr/share/arm/util -usr/share/arm/util/__init__.py -usr/share/arm/util/__init__.pyc -usr/share/arm/util/conf.py -usr/share/arm/util/conf.pyc -usr/share/arm/util/connections.py -usr/share/arm/util/connections.pyc -usr/share/arm/util/enum.py -usr/share/arm/util/enum.pyc -usr/share/arm/util/gtkTools.py -usr/share/arm/util/gtkTools.pyc -usr/share/arm/util/hostnames.py -usr/share/arm/util/hostnames.pyc -usr/share/arm/util/log.py -usr/share/arm/util/log.pyc -usr/share/arm/util/panel.py -usr/share/arm/util/panel.pyc -usr/share/arm/util/procName.py -usr/share/arm/util/procName.pyc -usr/share/arm/util/procTools.py -usr/share/arm/util/procTools.pyc -usr/share/arm/util/sysTools.py -usr/share/arm/util/sysTools.pyc -usr/share/arm/util/textInput.py -usr/share/arm/util/textInput.pyc -usr/share/arm/util/torConfig.py -usr/share/arm/util/torConfig.pyc -usr/share/arm/util/torInterpretor.py -usr/share/arm/util/torInterpretor.pyc -usr/share/arm/util/torTools.py -usr/share/arm/util/torTools.pyc -usr/share/arm/util/uiTools.py -usr/share/arm/util/uiTools.pyc -usr/share/arm/version.py -usr/share/arm/version.pyc -#usr/share/doc/arm -#usr/share/doc/arm/armrc.sample -#usr/share/man/man1/arm.1.gz diff --git a/config/rootfiles/packages/armv5tel/directfb b/config/rootfiles/packages/armv5tel/directfb deleted file mode 100644 index d77367ba0..000000000 --- a/config/rootfiles/packages/armv5tel/directfb +++ /dev/null @@ -1,402 +0,0 @@ -usr/bin/c64xdump -usr/bin/dfbdump -usr/bin/dfbdumpinput -usr/bin/dfbfx -usr/bin/dfbg -usr/bin/dfbinfo -usr/bin/dfbinput -usr/bin/dfbinspector -usr/bin/dfblayer -usr/bin/dfbmaster -usr/bin/dfbpenmount -usr/bin/dfbplay -usr/bin/dfbscreen -usr/bin/dfbshow -usr/bin/dfbswitch -usr/bin/directfb-config -usr/bin/directfb-csource -usr/bin/mkdfiff -usr/bin/mkdgiff -usr/bin/mkdgifft -usr/bin/pxa3xx_dump -#usr/include/++dfb -#usr/include/++dfb/++dfb.h -#usr/include/++dfb/++dfb_mangle.h -#usr/include/++dfb/++dfb_unmangle.h -#usr/include/++dfb/idirectfb.h -#usr/include/++dfb/idirectfbdatabuffer.h -#usr/include/++dfb/idirectfbdisplaylayer.h -#usr/include/++dfb/idirectfbeventbuffer.h -#usr/include/++dfb/idirectfbfont.h -#usr/include/++dfb/idirectfbimageprovider.h -#usr/include/++dfb/idirectfbinputdevice.h -#usr/include/++dfb/idirectfbpalette.h -#usr/include/++dfb/idirectfbscreen.h -#usr/include/++dfb/idirectfbsurface.h -#usr/include/++dfb/idirectfbvideoprovider.h -#usr/include/++dfb/idirectfbwindow.h -#usr/include/directfb -#usr/include/directfb-internal -#usr/include/directfb-internal/core -#usr/include/directfb-internal/core/CoreDFB.h -#usr/include/directfb-internal/core/CoreDFB_CallMode.h -#usr/include/directfb-internal/core/CoreDFB_includes.h -#usr/include/directfb-internal/core/CoreGraphicsState.h -#usr/include/directfb-internal/core/CoreGraphicsStateClient.h -#usr/include/directfb-internal/core/CoreGraphicsState_includes.h -#usr/include/directfb-internal/core/CoreInputDevice.h -#usr/include/directfb-internal/core/CoreInputDevice_includes.h -#usr/include/directfb-internal/core/CoreLayer.h -#usr/include/directfb-internal/core/CoreLayerContext.h -#usr/include/directfb-internal/core/CoreLayerContext_includes.h -#usr/include/directfb-internal/core/CoreLayerRegion.h -#usr/include/directfb-internal/core/CoreLayerRegion_includes.h -#usr/include/directfb-internal/core/CoreLayer_includes.h -#usr/include/directfb-internal/core/CorePalette.h -#usr/include/directfb-internal/core/CorePalette_includes.h -#usr/include/directfb-internal/core/CoreScreen.h -#usr/include/directfb-internal/core/CoreScreen_includes.h -#usr/include/directfb-internal/core/CoreSlave.h -#usr/include/directfb-internal/core/CoreSlave_includes.h -#usr/include/directfb-internal/core/CoreSurface.h -#usr/include/directfb-internal/core/CoreSurfaceClient.h -#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h -#usr/include/directfb-internal/core/CoreSurface_includes.h -#usr/include/directfb-internal/core/CoreWindow.h -#usr/include/directfb-internal/core/CoreWindowStack.h -#usr/include/directfb-internal/core/CoreWindowStack_includes.h -#usr/include/directfb-internal/core/CoreWindow_includes.h -#usr/include/directfb-internal/core/Debug.h -#usr/include/directfb-internal/core/DisplayTask.h -#usr/include/directfb-internal/core/Fifo.h -#usr/include/directfb-internal/core/Interface.h -#usr/include/directfb-internal/core/PacketBuffer.h -#usr/include/directfb-internal/core/Renderer.h -#usr/include/directfb-internal/core/SurfaceTask.h -#usr/include/directfb-internal/core/Task.h -#usr/include/directfb-internal/core/TaskManager.h -#usr/include/directfb-internal/core/TaskThreadsQ.h -#usr/include/directfb-internal/core/Util.h -#usr/include/directfb-internal/core/clipboard.h -#usr/include/directfb-internal/core/colorhash.h -#usr/include/directfb-internal/core/core.h -#usr/include/directfb-internal/core/core_parts.h -#usr/include/directfb-internal/core/core_strings.h -#usr/include/directfb-internal/core/core_system.h -#usr/include/directfb-internal/core/coredefs.h -#usr/include/directfb-internal/core/coretypes.h -#usr/include/directfb-internal/core/fonts.h -#usr/include/directfb-internal/core/gfxcard.h -#usr/include/directfb-internal/core/graphics_driver.h -#usr/include/directfb-internal/core/graphics_state.h -#usr/include/directfb-internal/core/input.h -#usr/include/directfb-internal/core/input_driver.h -#usr/include/directfb-internal/core/input_hub.h -#usr/include/directfb-internal/core/layer_context.h -#usr/include/directfb-internal/core/layer_control.h -#usr/include/directfb-internal/core/layer_region.h -#usr/include/directfb-internal/core/layers.h -#usr/include/directfb-internal/core/layers_internal.h -#usr/include/directfb-internal/core/palette.h -#usr/include/directfb-internal/core/screen.h -#usr/include/directfb-internal/core/screens.h -#usr/include/directfb-internal/core/screens_internal.h -#usr/include/directfb-internal/core/state.h -#usr/include/directfb-internal/core/surface.h -#usr/include/directfb-internal/core/surface_allocation.h -#usr/include/directfb-internal/core/surface_buffer.h -#usr/include/directfb-internal/core/surface_client.h -#usr/include/directfb-internal/core/surface_core.h -#usr/include/directfb-internal/core/surface_pool.h -#usr/include/directfb-internal/core/surface_pool_bridge.h -#usr/include/directfb-internal/core/system.h -#usr/include/directfb-internal/core/windows.h -#usr/include/directfb-internal/core/windows_internal.h -#usr/include/directfb-internal/core/windowstack.h -#usr/include/directfb-internal/core/wm.h -#usr/include/directfb-internal/core/wm_module.h -#usr/include/directfb-internal/devmem -#usr/include/directfb-internal/devmem/devmem.h -#usr/include/directfb-internal/devmem/surfacemanager.h -#usr/include/directfb-internal/display -#usr/include/directfb-internal/display/idirectfbdisplaylayer.h -#usr/include/directfb-internal/display/idirectfbpalette.h -#usr/include/directfb-internal/display/idirectfbscreen.h -#usr/include/directfb-internal/display/idirectfbsurface.h -#usr/include/directfb-internal/display/idirectfbsurface_layer.h -#usr/include/directfb-internal/display/idirectfbsurface_window.h -#usr/include/directfb-internal/dummy -#usr/include/directfb-internal/dummy/dummy.h -#usr/include/directfb-internal/fbdev -#usr/include/directfb-internal/fbdev/agp.h -#usr/include/directfb-internal/fbdev/fb.h -#usr/include/directfb-internal/fbdev/fbdev.h -#usr/include/directfb-internal/fbdev/surfacemanager.h -#usr/include/directfb-internal/fbdev/vt.h -#usr/include/directfb-internal/gfx -#usr/include/directfb-internal/gfx/clip.h -#usr/include/directfb-internal/gfx/convert.h -#usr/include/directfb-internal/gfx/generic -#usr/include/directfb-internal/gfx/generic/generic.h -#usr/include/directfb-internal/gfx/util.h -#usr/include/directfb-internal/idirectfb.h -#usr/include/directfb-internal/init.h -#usr/include/directfb-internal/input -#usr/include/directfb-internal/input/idirectfbinputbuffer.h -#usr/include/directfb-internal/input/idirectfbinputdevice.h -#usr/include/directfb-internal/media -#usr/include/directfb-internal/media/idirectfbdatabuffer.h -#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h -#usr/include/directfb-internal/media/idirectfbfont.h -#usr/include/directfb-internal/media/idirectfbimageprovider.h -#usr/include/directfb-internal/media/idirectfbimageprovider_client.h -#usr/include/directfb-internal/media/idirectfbvideoprovider.h -#usr/include/directfb-internal/misc -#usr/include/directfb-internal/misc/conf.h -#usr/include/directfb-internal/misc/gfx_util.h -#usr/include/directfb-internal/misc/util.h -#usr/include/directfb-internal/windows -#usr/include/directfb-internal/windows/idirectfbwindow.h -#usr/include/directfb/dfb_types.h -#usr/include/directfb/dfiff.h -#usr/include/directfb/dgiff.h -#usr/include/directfb/direct -#usr/include/directfb/direct/Lists.h -#usr/include/directfb/direct/LockWQ.h -#usr/include/directfb/direct/Magic.h -#usr/include/directfb/direct/Mutex.h -#usr/include/directfb/direct/Performer.h -#usr/include/directfb/direct/String.h -#usr/include/directfb/direct/TLSObject.h -#usr/include/directfb/direct/ToString.h -#usr/include/directfb/direct/Types++.h -#usr/include/directfb/direct/atomic.h -#usr/include/directfb/direct/build.h -#usr/include/directfb/direct/clock.h -#usr/include/directfb/direct/compiler.h -#usr/include/directfb/direct/conf.h -#usr/include/directfb/direct/debug.h -#usr/include/directfb/direct/direct.h -#usr/include/directfb/direct/fastlz.h -#usr/include/directfb/direct/fifo.h -#usr/include/directfb/direct/filesystem.h -#usr/include/directfb/direct/flz.h -#usr/include/directfb/direct/hash.h -#usr/include/directfb/direct/init.h -#usr/include/directfb/direct/interface.h -#usr/include/directfb/direct/interface_implementation.h -#usr/include/directfb/direct/list.h -#usr/include/directfb/direct/log.h -#usr/include/directfb/direct/log_domain.h -#usr/include/directfb/direct/map.h -#usr/include/directfb/direct/mem.h -#usr/include/directfb/direct/memcpy.h -#usr/include/directfb/direct/messages.h -#usr/include/directfb/direct/modules.h -#usr/include/directfb/direct/os -#usr/include/directfb/direct/os/clock.h -#usr/include/directfb/direct/os/filesystem.h -#usr/include/directfb/direct/os/linux -#usr/include/directfb/direct/os/linux/glibc -#usr/include/directfb/direct/os/linux/glibc/filesystem.h -#usr/include/directfb/direct/os/linux/glibc/mutex.h -#usr/include/directfb/direct/os/linux/glibc/thread.h -#usr/include/directfb/direct/os/linux/glibc/types.h -#usr/include/directfb/direct/os/linux/glibc/waitqueue.h -#usr/include/directfb/direct/os/log.h -#usr/include/directfb/direct/os/mem.h -#usr/include/directfb/direct/os/mutex.h -#usr/include/directfb/direct/os/signals.h -#usr/include/directfb/direct/os/system.h -#usr/include/directfb/direct/os/thread.h -#usr/include/directfb/direct/os/types.h -#usr/include/directfb/direct/os/waitqueue.h -#usr/include/directfb/direct/perf.h -#usr/include/directfb/direct/print.h -#usr/include/directfb/direct/processor.h -#usr/include/directfb/direct/result.h -#usr/include/directfb/direct/serial.h -#usr/include/directfb/direct/signals.h -#usr/include/directfb/direct/stream.h -#usr/include/directfb/direct/system.h -#usr/include/directfb/direct/thread.h -#usr/include/directfb/direct/trace.h -#usr/include/directfb/direct/tree.h -#usr/include/directfb/direct/types.h -#usr/include/directfb/direct/utf8.h -#usr/include/directfb/direct/util.h -#usr/include/directfb/direct/uuid.h -#usr/include/directfb/directfb++.h -#usr/include/directfb/directfb.h -#usr/include/directfb/directfb_build.h -#usr/include/directfb/directfb_graphics.h -#usr/include/directfb/directfb_keyboard.h -#usr/include/directfb/directfb_keynames.h -#usr/include/directfb/directfb_strings.h -#usr/include/directfb/directfb_util.h -#usr/include/directfb/directfb_version.h -#usr/include/directfb/directfb_water.h -#usr/include/directfb/directfb_water_strings.h -#usr/include/directfb/directfb_windows.h -#usr/include/directfb/directfbgl.h -#usr/include/directfb/directfbgl2.h -#usr/include/directfb/fusion -#usr/include/directfb/fusion/Debug.h -#usr/include/directfb/fusion/arena.h -#usr/include/directfb/fusion/build.h -#usr/include/directfb/fusion/call.h -#usr/include/directfb/fusion/conf.h -#usr/include/directfb/fusion/fusion.h -#usr/include/directfb/fusion/fusion_internal.h -#usr/include/directfb/fusion/hash.h -#usr/include/directfb/fusion/init.h -#usr/include/directfb/fusion/lock.h -#usr/include/directfb/fusion/object.h -#usr/include/directfb/fusion/property.h -#usr/include/directfb/fusion/protocol.h -#usr/include/directfb/fusion/reactor.h -#usr/include/directfb/fusion/ref.h -#usr/include/directfb/fusion/shm -#usr/include/directfb/fusion/shm/pool.h -#usr/include/directfb/fusion/shm/shm.h -#usr/include/directfb/fusion/shm/shm_internal.h -#usr/include/directfb/fusion/shmalloc.h -#usr/include/directfb/fusion/types.h -#usr/include/directfb/fusion/vector.h -#usr/lib/directfb-1.7-7 -#usr/lib/directfb-1.7-7/gfxdrivers -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so -#usr/lib/directfb-1.7-7/inputdrivers -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so -#usr/lib/directfb-1.7-7/interfaces -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la -usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so -#usr/lib/directfb-1.7-7/interfaces/IWater -#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la -usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so -#usr/lib/directfb-1.7-7/systems -#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la -usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la -usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la -usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la -usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so -#usr/lib/directfb-1.7-7/wm -#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la -usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so -usr/lib/lib++dfb-1.7.so.7 -usr/lib/lib++dfb-1.7.so.7.0.0 -#usr/lib/lib++dfb.la -#usr/lib/lib++dfb.so -#usr/lib/libdavinci_c64x.la -#usr/lib/libdavinci_c64x.so -usr/lib/libdavinci_c64x.so.0 -usr/lib/libdavinci_c64x.so.0.0.0 -usr/lib/libdirect-1.7.so.7 -usr/lib/libdirect-1.7.so.7.0.0 -#usr/lib/libdirect.la -usr/lib/libdirect.so -usr/lib/libdirectfb-1.7.so.7 -usr/lib/libdirectfb-1.7.so.7.0.0 -#usr/lib/libdirectfb.la -usr/lib/libdirectfb.so -usr/lib/libfusion-1.7.so.7 -usr/lib/libfusion-1.7.so.7.0.0 -#usr/lib/libfusion.la -usr/lib/libfusion.so -#usr/lib/pkgconfig/++dfb.pc -#usr/lib/pkgconfig/direct.pc -#usr/lib/pkgconfig/directfb-internal.pc -#usr/lib/pkgconfig/directfb.pc -#usr/lib/pkgconfig/fusion.pc -#usr/share/directfb-1.7.7 -usr/share/directfb-1.7.7/cursor.dat -usr/share/directfb-1.7.7/cursor.png -usr/share/directfb-1.7.7/decker.dgiff -usr/share/directfb-1.7.7/decker.ttf -#usr/share/man/man1/dfbg.1 -#usr/share/man/man1/directfb-csource.1 -#usr/share/man/man5/directfbrc.5 diff --git a/config/rootfiles/packages/armv7hl/directfb b/config/rootfiles/packages/armv7hl/directfb deleted file mode 100644 index 9863c68af..000000000 --- a/config/rootfiles/packages/armv7hl/directfb +++ /dev/null @@ -1,402 +0,0 @@ -usr/bin/c64xdump -usr/bin/dfbdump -usr/bin/dfbdumpinput -usr/bin/dfbfx -usr/bin/dfbg -usr/bin/dfbinfo -usr/bin/dfbinput -usr/bin/dfbinspector -usr/bin/dfblayer -usr/bin/dfbmaster -usr/bin/dfbpenmount -usr/bin/dfbplay -usr/bin/dfbscreen -usr/bin/dfbshow -usr/bin/dfbswitch -usr/bin/directfb-config -usr/bin/directfb-csource -usr/bin/mkdfiff -usr/bin/mkdgiff -usr/bin/mkdgifft -usr/bin/pxa3xx_dump -#usr/include/++dfb -#usr/include/++dfb/++dfb.h -#usr/include/++dfb/++dfb_mangle.h -#usr/include/++dfb/++dfb_unmangle.h -#usr/include/++dfb/idirectfb.h -#usr/include/++dfb/idirectfbdatabuffer.h -#usr/include/++dfb/idirectfbdisplaylayer.h -#usr/include/++dfb/idirectfbeventbuffer.h -#usr/include/++dfb/idirectfbfont.h -#usr/include/++dfb/idirectfbimageprovider.h -#usr/include/++dfb/idirectfbinputdevice.h -#usr/include/++dfb/idirectfbpalette.h -#usr/include/++dfb/idirectfbscreen.h -#usr/include/++dfb/idirectfbsurface.h -#usr/include/++dfb/idirectfbvideoprovider.h -#usr/include/++dfb/idirectfbwindow.h -#usr/include/directfb -#usr/include/directfb-internal -#usr/include/directfb-internal/core -#usr/include/directfb-internal/core/CoreDFB.h -#usr/include/directfb-internal/core/CoreDFB_CallMode.h -#usr/include/directfb-internal/core/CoreDFB_includes.h -#usr/include/directfb-internal/core/CoreGraphicsState.h -#usr/include/directfb-internal/core/CoreGraphicsStateClient.h -#usr/include/directfb-internal/core/CoreGraphicsState_includes.h -#usr/include/directfb-internal/core/CoreInputDevice.h -#usr/include/directfb-internal/core/CoreInputDevice_includes.h -#usr/include/directfb-internal/core/CoreLayer.h -#usr/include/directfb-internal/core/CoreLayerContext.h -#usr/include/directfb-internal/core/CoreLayerContext_includes.h -#usr/include/directfb-internal/core/CoreLayerRegion.h -#usr/include/directfb-internal/core/CoreLayerRegion_includes.h -#usr/include/directfb-internal/core/CoreLayer_includes.h -#usr/include/directfb-internal/core/CorePalette.h -#usr/include/directfb-internal/core/CorePalette_includes.h -#usr/include/directfb-internal/core/CoreScreen.h -#usr/include/directfb-internal/core/CoreScreen_includes.h -#usr/include/directfb-internal/core/CoreSlave.h -#usr/include/directfb-internal/core/CoreSlave_includes.h -#usr/include/directfb-internal/core/CoreSurface.h -#usr/include/directfb-internal/core/CoreSurfaceClient.h -#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h -#usr/include/directfb-internal/core/CoreSurface_includes.h -#usr/include/directfb-internal/core/CoreWindow.h -#usr/include/directfb-internal/core/CoreWindowStack.h -#usr/include/directfb-internal/core/CoreWindowStack_includes.h -#usr/include/directfb-internal/core/CoreWindow_includes.h -#usr/include/directfb-internal/core/Debug.h -#usr/include/directfb-internal/core/DisplayTask.h -#usr/include/directfb-internal/core/Fifo.h -#usr/include/directfb-internal/core/Interface.h -#usr/include/directfb-internal/core/PacketBuffer.h -#usr/include/directfb-internal/core/Renderer.h -#usr/include/directfb-internal/core/SurfaceTask.h -#usr/include/directfb-internal/core/Task.h -#usr/include/directfb-internal/core/TaskManager.h -#usr/include/directfb-internal/core/TaskThreadsQ.h -#usr/include/directfb-internal/core/Util.h -#usr/include/directfb-internal/core/clipboard.h -#usr/include/directfb-internal/core/colorhash.h -#usr/include/directfb-internal/core/core.h -#usr/include/directfb-internal/core/core_parts.h -#usr/include/directfb-internal/core/core_strings.h -#usr/include/directfb-internal/core/core_system.h -#usr/include/directfb-internal/core/coredefs.h -#usr/include/directfb-internal/core/coretypes.h -#usr/include/directfb-internal/core/fonts.h -#usr/include/directfb-internal/core/gfxcard.h -#usr/include/directfb-internal/core/graphics_driver.h -#usr/include/directfb-internal/core/graphics_state.h -#usr/include/directfb-internal/core/input.h -#usr/include/directfb-internal/core/input_driver.h -#usr/include/directfb-internal/core/input_hub.h -#usr/include/directfb-internal/core/layer_context.h -#usr/include/directfb-internal/core/layer_control.h -#usr/include/directfb-internal/core/layer_region.h -#usr/include/directfb-internal/core/layers.h -#usr/include/directfb-internal/core/layers_internal.h -#usr/include/directfb-internal/core/palette.h -#usr/include/directfb-internal/core/screen.h -#usr/include/directfb-internal/core/screens.h -#usr/include/directfb-internal/core/screens_internal.h -#usr/include/directfb-internal/core/state.h -#usr/include/directfb-internal/core/surface.h -#usr/include/directfb-internal/core/surface_allocation.h -#usr/include/directfb-internal/core/surface_buffer.h -#usr/include/directfb-internal/core/surface_client.h -#usr/include/directfb-internal/core/surface_core.h -#usr/include/directfb-internal/core/surface_pool.h -#usr/include/directfb-internal/core/surface_pool_bridge.h -#usr/include/directfb-internal/core/system.h -#usr/include/directfb-internal/core/windows.h -#usr/include/directfb-internal/core/windows_internal.h -#usr/include/directfb-internal/core/windowstack.h -#usr/include/directfb-internal/core/wm.h -#usr/include/directfb-internal/core/wm_module.h -#usr/include/directfb-internal/devmem -#usr/include/directfb-internal/devmem/devmem.h -#usr/include/directfb-internal/devmem/surfacemanager.h -#usr/include/directfb-internal/display -#usr/include/directfb-internal/display/idirectfbdisplaylayer.h -#usr/include/directfb-internal/display/idirectfbpalette.h -#usr/include/directfb-internal/display/idirectfbscreen.h -#usr/include/directfb-internal/display/idirectfbsurface.h -#usr/include/directfb-internal/display/idirectfbsurface_layer.h -#usr/include/directfb-internal/display/idirectfbsurface_window.h -#usr/include/directfb-internal/dummy -#usr/include/directfb-internal/dummy/dummy.h -#usr/include/directfb-internal/fbdev -#usr/include/directfb-internal/fbdev/agp.h -#usr/include/directfb-internal/fbdev/fb.h -#usr/include/directfb-internal/fbdev/fbdev.h -#usr/include/directfb-internal/fbdev/surfacemanager.h -#usr/include/directfb-internal/fbdev/vt.h -#usr/include/directfb-internal/gfx -#usr/include/directfb-internal/gfx/clip.h -#usr/include/directfb-internal/gfx/convert.h -#usr/include/directfb-internal/gfx/generic -#usr/include/directfb-internal/gfx/generic/generic.h -#usr/include/directfb-internal/gfx/util.h -#usr/include/directfb-internal/idirectfb.h -#usr/include/directfb-internal/init.h -#usr/include/directfb-internal/input -#usr/include/directfb-internal/input/idirectfbinputbuffer.h -#usr/include/directfb-internal/input/idirectfbinputdevice.h -#usr/include/directfb-internal/media -#usr/include/directfb-internal/media/idirectfbdatabuffer.h -#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h -#usr/include/directfb-internal/media/idirectfbfont.h -#usr/include/directfb-internal/media/idirectfbimageprovider.h -#usr/include/directfb-internal/media/idirectfbimageprovider_client.h -#usr/include/directfb-internal/media/idirectfbvideoprovider.h -#usr/include/directfb-internal/misc -#usr/include/directfb-internal/misc/conf.h -#usr/include/directfb-internal/misc/gfx_util.h -#usr/include/directfb-internal/misc/util.h -#usr/include/directfb-internal/windows -#usr/include/directfb-internal/windows/idirectfbwindow.h -#usr/include/directfb/dfb_types.h -#usr/include/directfb/dfiff.h -#usr/include/directfb/dgiff.h -#usr/include/directfb/direct -#usr/include/directfb/direct/Lists.h -#usr/include/directfb/direct/LockWQ.h -#usr/include/directfb/direct/Magic.h -#usr/include/directfb/direct/Mutex.h -#usr/include/directfb/direct/Performer.h -#usr/include/directfb/direct/String.h -#usr/include/directfb/direct/TLSObject.h -#usr/include/directfb/direct/ToString.h -#usr/include/directfb/direct/Types++.h -#usr/include/directfb/direct/atomic.h -#usr/include/directfb/direct/build.h -#usr/include/directfb/direct/clock.h -#usr/include/directfb/direct/compiler.h -#usr/include/directfb/direct/conf.h -#usr/include/directfb/direct/debug.h -#usr/include/directfb/direct/direct.h -#usr/include/directfb/direct/fastlz.h -#usr/include/directfb/direct/fifo.h -#usr/include/directfb/direct/filesystem.h -#usr/include/directfb/direct/flz.h -#usr/include/directfb/direct/hash.h -#usr/include/directfb/direct/init.h -#usr/include/directfb/direct/interface.h -#usr/include/directfb/direct/interface_implementation.h -#usr/include/directfb/direct/list.h -#usr/include/directfb/direct/log.h -#usr/include/directfb/direct/log_domain.h -#usr/include/directfb/direct/map.h -#usr/include/directfb/direct/mem.h -#usr/include/directfb/direct/memcpy.h -#usr/include/directfb/direct/messages.h -#usr/include/directfb/direct/modules.h -#usr/include/directfb/direct/os -#usr/include/directfb/direct/os/clock.h -#usr/include/directfb/direct/os/filesystem.h -#usr/include/directfb/direct/os/linux -#usr/include/directfb/direct/os/linux/glibc -#usr/include/directfb/direct/os/linux/glibc/filesystem.h -#usr/include/directfb/direct/os/linux/glibc/mutex.h -#usr/include/directfb/direct/os/linux/glibc/thread.h -#usr/include/directfb/direct/os/linux/glibc/types.h -#usr/include/directfb/direct/os/linux/glibc/waitqueue.h -#usr/include/directfb/direct/os/log.h -#usr/include/directfb/direct/os/mem.h -#usr/include/directfb/direct/os/mutex.h -#usr/include/directfb/direct/os/signals.h -#usr/include/directfb/direct/os/system.h -#usr/include/directfb/direct/os/thread.h -#usr/include/directfb/direct/os/types.h -#usr/include/directfb/direct/os/waitqueue.h -#usr/include/directfb/direct/perf.h -#usr/include/directfb/direct/print.h -#usr/include/directfb/direct/processor.h -#usr/include/directfb/direct/result.h -#usr/include/directfb/direct/serial.h -#usr/include/directfb/direct/signals.h -#usr/include/directfb/direct/stream.h -#usr/include/directfb/direct/system.h -#usr/include/directfb/direct/thread.h -#usr/include/directfb/direct/trace.h -#usr/include/directfb/direct/tree.h -#usr/include/directfb/direct/types.h -#usr/include/directfb/direct/utf8.h -#usr/include/directfb/direct/util.h -#usr/include/directfb/direct/uuid.h -#usr/include/directfb/directfb++.h -#usr/include/directfb/directfb.h -#usr/include/directfb/directfb_build.h -#usr/include/directfb/directfb_graphics.h -#usr/include/directfb/directfb_keyboard.h -#usr/include/directfb/directfb_keynames.h -#usr/include/directfb/directfb_strings.h -#usr/include/directfb/directfb_util.h -#usr/include/directfb/directfb_version.h -#usr/include/directfb/directfb_water.h -#usr/include/directfb/directfb_water_strings.h -#usr/include/directfb/directfb_windows.h -#usr/include/directfb/directfbgl.h -#usr/include/directfb/directfbgl2.h -#usr/include/directfb/fusion -#usr/include/directfb/fusion/Debug.h -#usr/include/directfb/fusion/arena.h -#usr/include/directfb/fusion/build.h -#usr/include/directfb/fusion/call.h -#usr/include/directfb/fusion/conf.h -#usr/include/directfb/fusion/fusion.h -#usr/include/directfb/fusion/fusion_internal.h -#usr/include/directfb/fusion/hash.h -#usr/include/directfb/fusion/init.h -#usr/include/directfb/fusion/lock.h -#usr/include/directfb/fusion/object.h -#usr/include/directfb/fusion/property.h -#usr/include/directfb/fusion/protocol.h -#usr/include/directfb/fusion/reactor.h -#usr/include/directfb/fusion/ref.h -#usr/include/directfb/fusion/shm -#usr/include/directfb/fusion/shm/pool.h -#usr/include/directfb/fusion/shm/shm.h -#usr/include/directfb/fusion/shm/shm_internal.h -#usr/include/directfb/fusion/shmalloc.h -#usr/include/directfb/fusion/types.h -#usr/include/directfb/fusion/vector.h -#usr/lib/directfb-1.7-7 -#usr/lib/directfb-1.7-7/gfxdrivers -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so -#usr/lib/directfb-1.7-7/inputdrivers -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so -#usr/lib/directfb-1.7-7/interfaces -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la -usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so -#usr/lib/directfb-1.7-7/interfaces/IWater -#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la -usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so -#usr/lib/directfb-1.7-7/systems -#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la -usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la -usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la -usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la -usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so -#usr/lib/directfb-1.7-7/wm -#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la -usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so -usr/lib/lib++dfb-1.7.so.7 -usr/lib/lib++dfb-1.7.so.7.0.0 -#usr/lib/lib++dfb.la -#usr/lib/lib++dfb.so -#usr/lib/libdavinci_c64x.la -#usr/lib/libdavinci_c64x.so -usr/lib/libdavinci_c64x.so.0 -usr/lib/libdavinci_c64x.so.0.0.0 -usr/lib/libdirect-1.7.so.7 -usr/lib/libdirect-1.7.so.7.0.0 -#usr/lib/libdirect.la -#usr/lib/libdirect.so -usr/lib/libdirectfb-1.7.so.7 -usr/lib/libdirectfb-1.7.so.7.0.0 -#usr/lib/libdirectfb.la -#usr/lib/libdirectfb.so -usr/lib/libfusion-1.7.so.7 -usr/lib/libfusion-1.7.so.7.0.0 -#usr/lib/libfusion.la -#usr/lib/libfusion.so -#usr/lib/pkgconfig/++dfb.pc -#usr/lib/pkgconfig/direct.pc -#usr/lib/pkgconfig/directfb-internal.pc -#usr/lib/pkgconfig/directfb.pc -#usr/lib/pkgconfig/fusion.pc -#usr/share/directfb-1.7.7 -usr/share/directfb-1.7.7/cursor.dat -usr/share/directfb-1.7.7/cursor.png -usr/share/directfb-1.7.7/decker.dgiff -usr/share/directfb-1.7.7/decker.ttf -#usr/share/man/man1/dfbg.1 -#usr/share/man/man1/directfb-csource.1 -#usr/share/man/man5/directfbrc.5 diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent deleted file mode 100644 index 1d68f74d6..000000000 --- a/config/rootfiles/packages/check_mk_agent +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/check_mk_agent -etc/xinetd.d/check_mk_agent -usr/bin/waitmax diff --git a/config/rootfiles/packages/i586/directfb b/config/rootfiles/packages/i586/directfb deleted file mode 100644 index 9e61f8bf8..000000000 --- a/config/rootfiles/packages/i586/directfb +++ /dev/null @@ -1,397 +0,0 @@ -usr/bin/dfbdump -usr/bin/dfbdumpinput -usr/bin/dfbfx -usr/bin/dfbg -usr/bin/dfbinfo -usr/bin/dfbinput -usr/bin/dfbinspector -usr/bin/dfblayer -usr/bin/dfbmaster -usr/bin/dfbpenmount -usr/bin/dfbplay -usr/bin/dfbscreen -usr/bin/dfbshow -usr/bin/dfbswitch -usr/bin/directfb-config -usr/bin/directfb-csource -usr/bin/mkdfiff -usr/bin/mkdgiff -usr/bin/mkdgifft -usr/bin/pxa3xx_dump -#usr/include/++dfb -#usr/include/++dfb/++dfb.h -#usr/include/++dfb/++dfb_mangle.h -#usr/include/++dfb/++dfb_unmangle.h -#usr/include/++dfb/idirectfb.h -#usr/include/++dfb/idirectfbdatabuffer.h -#usr/include/++dfb/idirectfbdisplaylayer.h -#usr/include/++dfb/idirectfbeventbuffer.h -#usr/include/++dfb/idirectfbfont.h -#usr/include/++dfb/idirectfbimageprovider.h -#usr/include/++dfb/idirectfbinputdevice.h -#usr/include/++dfb/idirectfbpalette.h -#usr/include/++dfb/idirectfbscreen.h -#usr/include/++dfb/idirectfbsurface.h -#usr/include/++dfb/idirectfbvideoprovider.h -#usr/include/++dfb/idirectfbwindow.h -#usr/include/directfb -#usr/include/directfb-internal -#usr/include/directfb-internal/core -#usr/include/directfb-internal/core/CoreDFB.h -#usr/include/directfb-internal/core/CoreDFB_CallMode.h -#usr/include/directfb-internal/core/CoreDFB_includes.h -#usr/include/directfb-internal/core/CoreGraphicsState.h -#usr/include/directfb-internal/core/CoreGraphicsStateClient.h -#usr/include/directfb-internal/core/CoreGraphicsState_includes.h -#usr/include/directfb-internal/core/CoreInputDevice.h -#usr/include/directfb-internal/core/CoreInputDevice_includes.h -#usr/include/directfb-internal/core/CoreLayer.h -#usr/include/directfb-internal/core/CoreLayerContext.h -#usr/include/directfb-internal/core/CoreLayerContext_includes.h -#usr/include/directfb-internal/core/CoreLayerRegion.h -#usr/include/directfb-internal/core/CoreLayerRegion_includes.h -#usr/include/directfb-internal/core/CoreLayer_includes.h -#usr/include/directfb-internal/core/CorePalette.h -#usr/include/directfb-internal/core/CorePalette_includes.h -#usr/include/directfb-internal/core/CoreScreen.h -#usr/include/directfb-internal/core/CoreScreen_includes.h -#usr/include/directfb-internal/core/CoreSlave.h -#usr/include/directfb-internal/core/CoreSlave_includes.h -#usr/include/directfb-internal/core/CoreSurface.h -#usr/include/directfb-internal/core/CoreSurfaceClient.h -#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h -#usr/include/directfb-internal/core/CoreSurface_includes.h -#usr/include/directfb-internal/core/CoreWindow.h -#usr/include/directfb-internal/core/CoreWindowStack.h -#usr/include/directfb-internal/core/CoreWindowStack_includes.h -#usr/include/directfb-internal/core/CoreWindow_includes.h -#usr/include/directfb-internal/core/Debug.h -#usr/include/directfb-internal/core/DisplayTask.h -#usr/include/directfb-internal/core/Fifo.h -#usr/include/directfb-internal/core/Interface.h -#usr/include/directfb-internal/core/PacketBuffer.h -#usr/include/directfb-internal/core/Renderer.h -#usr/include/directfb-internal/core/SurfaceTask.h -#usr/include/directfb-internal/core/Task.h -#usr/include/directfb-internal/core/TaskManager.h -#usr/include/directfb-internal/core/TaskThreadsQ.h -#usr/include/directfb-internal/core/Util.h -#usr/include/directfb-internal/core/clipboard.h -#usr/include/directfb-internal/core/colorhash.h -#usr/include/directfb-internal/core/core.h -#usr/include/directfb-internal/core/core_parts.h -#usr/include/directfb-internal/core/core_strings.h -#usr/include/directfb-internal/core/core_system.h -#usr/include/directfb-internal/core/coredefs.h -#usr/include/directfb-internal/core/coretypes.h -#usr/include/directfb-internal/core/fonts.h -#usr/include/directfb-internal/core/gfxcard.h -#usr/include/directfb-internal/core/graphics_driver.h -#usr/include/directfb-internal/core/graphics_state.h -#usr/include/directfb-internal/core/input.h -#usr/include/directfb-internal/core/input_driver.h -#usr/include/directfb-internal/core/input_hub.h -#usr/include/directfb-internal/core/layer_context.h -#usr/include/directfb-internal/core/layer_control.h -#usr/include/directfb-internal/core/layer_region.h -#usr/include/directfb-internal/core/layers.h -#usr/include/directfb-internal/core/layers_internal.h -#usr/include/directfb-internal/core/palette.h -#usr/include/directfb-internal/core/screen.h -#usr/include/directfb-internal/core/screens.h -#usr/include/directfb-internal/core/screens_internal.h -#usr/include/directfb-internal/core/state.h -#usr/include/directfb-internal/core/surface.h -#usr/include/directfb-internal/core/surface_allocation.h -#usr/include/directfb-internal/core/surface_buffer.h -#usr/include/directfb-internal/core/surface_client.h -#usr/include/directfb-internal/core/surface_core.h -#usr/include/directfb-internal/core/surface_pool.h -#usr/include/directfb-internal/core/surface_pool_bridge.h -#usr/include/directfb-internal/core/system.h -#usr/include/directfb-internal/core/windows.h -#usr/include/directfb-internal/core/windows_internal.h -#usr/include/directfb-internal/core/windowstack.h -#usr/include/directfb-internal/core/wm.h -#usr/include/directfb-internal/core/wm_module.h -#usr/include/directfb-internal/devmem -#usr/include/directfb-internal/devmem/devmem.h -#usr/include/directfb-internal/devmem/surfacemanager.h -#usr/include/directfb-internal/display -#usr/include/directfb-internal/display/idirectfbdisplaylayer.h -#usr/include/directfb-internal/display/idirectfbpalette.h -#usr/include/directfb-internal/display/idirectfbscreen.h -#usr/include/directfb-internal/display/idirectfbsurface.h -#usr/include/directfb-internal/display/idirectfbsurface_layer.h -#usr/include/directfb-internal/display/idirectfbsurface_window.h -#usr/include/directfb-internal/dummy -#usr/include/directfb-internal/dummy/dummy.h -#usr/include/directfb-internal/fbdev -#usr/include/directfb-internal/fbdev/agp.h -#usr/include/directfb-internal/fbdev/fb.h -#usr/include/directfb-internal/fbdev/fbdev.h -#usr/include/directfb-internal/fbdev/surfacemanager.h -#usr/include/directfb-internal/fbdev/vt.h -#usr/include/directfb-internal/gfx -#usr/include/directfb-internal/gfx/clip.h -#usr/include/directfb-internal/gfx/convert.h -#usr/include/directfb-internal/gfx/generic -#usr/include/directfb-internal/gfx/generic/generic.h -#usr/include/directfb-internal/gfx/util.h -#usr/include/directfb-internal/idirectfb.h -#usr/include/directfb-internal/init.h -#usr/include/directfb-internal/input -#usr/include/directfb-internal/input/idirectfbinputbuffer.h -#usr/include/directfb-internal/input/idirectfbinputdevice.h -#usr/include/directfb-internal/media -#usr/include/directfb-internal/media/idirectfbdatabuffer.h -#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h -#usr/include/directfb-internal/media/idirectfbfont.h -#usr/include/directfb-internal/media/idirectfbimageprovider.h -#usr/include/directfb-internal/media/idirectfbimageprovider_client.h -#usr/include/directfb-internal/media/idirectfbvideoprovider.h -#usr/include/directfb-internal/misc -#usr/include/directfb-internal/misc/conf.h -#usr/include/directfb-internal/misc/gfx_util.h -#usr/include/directfb-internal/misc/util.h -#usr/include/directfb-internal/windows -#usr/include/directfb-internal/windows/idirectfbwindow.h -#usr/include/directfb/dfb_types.h -#usr/include/directfb/dfiff.h -#usr/include/directfb/dgiff.h -#usr/include/directfb/direct -#usr/include/directfb/direct/Lists.h -#usr/include/directfb/direct/LockWQ.h -#usr/include/directfb/direct/Magic.h -#usr/include/directfb/direct/Mutex.h -#usr/include/directfb/direct/Performer.h -#usr/include/directfb/direct/String.h -#usr/include/directfb/direct/TLSObject.h -#usr/include/directfb/direct/ToString.h -#usr/include/directfb/direct/Types++.h -#usr/include/directfb/direct/atomic.h -#usr/include/directfb/direct/build.h -#usr/include/directfb/direct/clock.h -#usr/include/directfb/direct/compiler.h -#usr/include/directfb/direct/conf.h -#usr/include/directfb/direct/debug.h -#usr/include/directfb/direct/direct.h -#usr/include/directfb/direct/fastlz.h -#usr/include/directfb/direct/fifo.h -#usr/include/directfb/direct/filesystem.h -#usr/include/directfb/direct/flz.h -#usr/include/directfb/direct/hash.h -#usr/include/directfb/direct/init.h -#usr/include/directfb/direct/interface.h -#usr/include/directfb/direct/interface_implementation.h -#usr/include/directfb/direct/list.h -#usr/include/directfb/direct/log.h -#usr/include/directfb/direct/log_domain.h -#usr/include/directfb/direct/map.h -#usr/include/directfb/direct/mem.h -#usr/include/directfb/direct/memcpy.h -#usr/include/directfb/direct/messages.h -#usr/include/directfb/direct/modules.h -#usr/include/directfb/direct/os -#usr/include/directfb/direct/os/clock.h -#usr/include/directfb/direct/os/filesystem.h -#usr/include/directfb/direct/os/linux -#usr/include/directfb/direct/os/linux/glibc -#usr/include/directfb/direct/os/linux/glibc/filesystem.h -#usr/include/directfb/direct/os/linux/glibc/mutex.h -#usr/include/directfb/direct/os/linux/glibc/thread.h -#usr/include/directfb/direct/os/linux/glibc/types.h -#usr/include/directfb/direct/os/linux/glibc/waitqueue.h -#usr/include/directfb/direct/os/log.h -#usr/include/directfb/direct/os/mem.h -#usr/include/directfb/direct/os/mutex.h -#usr/include/directfb/direct/os/signals.h -#usr/include/directfb/direct/os/system.h -#usr/include/directfb/direct/os/thread.h -#usr/include/directfb/direct/os/types.h -#usr/include/directfb/direct/os/waitqueue.h -#usr/include/directfb/direct/perf.h -#usr/include/directfb/direct/print.h -#usr/include/directfb/direct/processor.h -#usr/include/directfb/direct/result.h -#usr/include/directfb/direct/serial.h -#usr/include/directfb/direct/signals.h -#usr/include/directfb/direct/stream.h -#usr/include/directfb/direct/system.h -#usr/include/directfb/direct/thread.h -#usr/include/directfb/direct/trace.h -#usr/include/directfb/direct/tree.h -#usr/include/directfb/direct/types.h -#usr/include/directfb/direct/utf8.h -#usr/include/directfb/direct/util.h -#usr/include/directfb/direct/uuid.h -#usr/include/directfb/directfb++.h -#usr/include/directfb/directfb.h -#usr/include/directfb/directfb_build.h -#usr/include/directfb/directfb_graphics.h -#usr/include/directfb/directfb_keyboard.h -#usr/include/directfb/directfb_keynames.h -#usr/include/directfb/directfb_strings.h -#usr/include/directfb/directfb_util.h -#usr/include/directfb/directfb_version.h -#usr/include/directfb/directfb_water.h -#usr/include/directfb/directfb_water_strings.h -#usr/include/directfb/directfb_windows.h -#usr/include/directfb/directfbgl.h -#usr/include/directfb/directfbgl2.h -#usr/include/directfb/fusion -#usr/include/directfb/fusion/Debug.h -#usr/include/directfb/fusion/arena.h -#usr/include/directfb/fusion/build.h -#usr/include/directfb/fusion/call.h -#usr/include/directfb/fusion/conf.h -#usr/include/directfb/fusion/fusion.h -#usr/include/directfb/fusion/fusion_internal.h -#usr/include/directfb/fusion/hash.h -#usr/include/directfb/fusion/init.h -#usr/include/directfb/fusion/lock.h -#usr/include/directfb/fusion/object.h -#usr/include/directfb/fusion/property.h -#usr/include/directfb/fusion/protocol.h -#usr/include/directfb/fusion/reactor.h -#usr/include/directfb/fusion/ref.h -#usr/include/directfb/fusion/shm -#usr/include/directfb/fusion/shm/pool.h -#usr/include/directfb/fusion/shm/shm.h -#usr/include/directfb/fusion/shm/shm_internal.h -#usr/include/directfb/fusion/shmalloc.h -#usr/include/directfb/fusion/types.h -#usr/include/directfb/fusion/vector.h -#usr/lib/directfb-1.7-7 -#usr/lib/directfb-1.7-7/gfxdrivers -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so -#usr/lib/directfb-1.7-7/inputdrivers -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so -#usr/lib/directfb-1.7-7/interfaces -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la -usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so -#usr/lib/directfb-1.7-7/interfaces/IWater -#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la -usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so -#usr/lib/directfb-1.7-7/systems -#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la -usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la -usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la -usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la -usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so -#usr/lib/directfb-1.7-7/wm -#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la -usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so -usr/lib/lib++dfb-1.7.so.7 -usr/lib/lib++dfb-1.7.so.7.0.0 -#usr/lib/lib++dfb.la -#usr/lib/lib++dfb.so -usr/lib/libdirect-1.7.so.7 -usr/lib/libdirect-1.7.so.7.0.0 -#usr/lib/libdirect.la -#usr/lib/libdirect.so -usr/lib/libdirectfb-1.7.so.7 -usr/lib/libdirectfb-1.7.so.7.0.0 -#usr/lib/libdirectfb.la -usr/lib/libdirectfb.so -usr/lib/libfusion-1.7.so.7 -usr/lib/libfusion-1.7.so.7.0.0 -#usr/lib/libfusion.la -#usr/lib/libfusion.so -#usr/lib/pkgconfig/++dfb.pc -#usr/lib/pkgconfig/direct.pc -#usr/lib/pkgconfig/directfb-internal.pc -#usr/lib/pkgconfig/directfb.pc -#usr/lib/pkgconfig/fusion.pc -#usr/share/directfb-1.7.7 -usr/share/directfb-1.7.7/cursor.dat -usr/share/directfb-1.7.7/cursor.png -usr/share/directfb-1.7.7/decker.dgiff -usr/share/directfb-1.7.7/decker.ttf -#usr/share/man/man1/dfbg.1 -#usr/share/man/man1/directfb-csource.1 -#usr/share/man/man5/directfbrc.5 diff --git a/config/rootfiles/packages/icecast b/config/rootfiles/packages/icecast deleted file mode 100644 index 7a79bb518..000000000 --- a/config/rootfiles/packages/icecast +++ /dev/null @@ -1,55 +0,0 @@ -usr/bin/icecast -usr/etc/icecast.xml -#usr/share/doc/icecast -#usr/share/doc/icecast/AUTHORS -#usr/share/doc/icecast/COPYING -#usr/share/doc/icecast/ChangeLog -#usr/share/doc/icecast/NEWS -#usr/share/doc/icecast/README -#usr/share/doc/icecast/TODO -usr/share/doc/icecast/icecast2_admin.html -usr/share/doc/icecast/icecast2_basicsetup.html -usr/share/doc/icecast/icecast2_changes.html -usr/share/doc/icecast/icecast2_config_file.html -usr/share/doc/icecast/icecast2_faq.html -usr/share/doc/icecast/icecast2_glossary.html -usr/share/doc/icecast/icecast2_introduction.html -usr/share/doc/icecast/icecast2_listenerauth.html -usr/share/doc/icecast/icecast2_relay.html -usr/share/doc/icecast/icecast2_stats.html -usr/share/doc/icecast/icecast2_win32.html -usr/share/doc/icecast/icecast2_yp.html -usr/share/doc/icecast/index.html -usr/share/doc/icecast/listener_auth1.jpg -usr/share/doc/icecast/listener_auth2.jpg -usr/share/doc/icecast/listener_auth3.jpg -#usr/share/icecast -#usr/share/icecast/admin -usr/share/icecast/admin/listclients.xsl -usr/share/icecast/admin/listmounts.xsl -usr/share/icecast/admin/manageauth.xsl -usr/share/icecast/admin/moveclients.xsl -usr/share/icecast/admin/response.xsl -usr/share/icecast/admin/stats.xsl -usr/share/icecast/admin/updatemetadata.xsl -#usr/share/icecast/doc -usr/share/icecast/doc/icecast.xml.dist -usr/share/icecast/doc/icecast_minimal.xml.dist -usr/share/icecast/doc/icecast_shoutcast_compat.xml.dist -usr/share/icecast/doc/icecast_urlauth.xml.dist -#usr/share/icecast/web -usr/share/icecast/web/auth.xsl -usr/share/icecast/web/corner_bottomleft.jpg -usr/share/icecast/web/corner_bottomright.jpg -usr/share/icecast/web/corner_topleft.jpg -usr/share/icecast/web/corner_topright.jpg -usr/share/icecast/web/icecast.png -usr/share/icecast/web/key.gif -usr/share/icecast/web/key.png -usr/share/icecast/web/server_version.xsl -usr/share/icecast/web/status.xsl -usr/share/icecast/web/status2.xsl -usr/share/icecast/web/style.css -usr/share/icecast/web/tunein.png -usr/share/doc/icecast/masterslave.png -usr/share/doc/icecast/relay.png diff --git a/config/rootfiles/packages/icegenerator b/config/rootfiles/packages/icegenerator deleted file mode 100644 index 940c82947..000000000 --- a/config/rootfiles/packages/icegenerator +++ /dev/null @@ -1 +0,0 @@ -usr/local/bin/icegenerator diff --git a/config/rootfiles/packages/multicat b/config/rootfiles/packages/multicat deleted file mode 100644 index 8d0600094..000000000 --- a/config/rootfiles/packages/multicat +++ /dev/null @@ -1,13 +0,0 @@ -usr/bin/aggregartp -usr/bin/ingests -usr/bin/lasts -usr/bin/multicat -usr/bin/multicat_validate -usr/bin/offsets -usr/bin/reordertp -#usr/share/man/man1/aggregartp.1 -#usr/share/man/man1/ingests.1 -#usr/share/man/man1/lasts.1 -#usr/share/man/man1/multicat.1 -#usr/share/man/man1/offsets.1 -#usr/share/man/man1/reordertp.1 diff --git a/config/rootfiles/packages/rtpproxy b/config/rootfiles/packages/rtpproxy deleted file mode 100644 index 6fcc1e44c..000000000 --- a/config/rootfiles/packages/rtpproxy +++ /dev/null @@ -1,5 +0,0 @@ -etc/rc.d/init.d/rtpproxy -usr/bin/makeann -usr/bin/rtpproxy -#usr/bin/rtpproxy_debug -#usr/share/man/man8/rtpproxy.8 diff --git a/config/rootfiles/packages/streamripper b/config/rootfiles/packages/streamripper deleted file mode 100644 index f3abba584..000000000 --- a/config/rootfiles/packages/streamripper +++ /dev/null @@ -1,14 +0,0 @@ -usr/bin/agrep -usr/bin/streamripper -#usr/include/tre -#usr/include/tre/regex.h -#usr/include/tre/tre-config.h -#usr/lib/libtre.a -#usr/lib/libtre.la -usr/lib/libtre.so -usr/lib/libtre.so.4 -usr/lib/libtre.so.4.2.2 -#usr/lib/pkgconfig/tre.pc -#usr/share/locale/fi/LC_MESSAGES/tre.mo -#usr/share/man/man1/agrep.1 -#usr/share/man/man1/streamripper.1 diff --git a/config/rootfiles/packages/x86_64/directfb b/config/rootfiles/packages/x86_64/directfb deleted file mode 100644 index dc291bf12..000000000 --- a/config/rootfiles/packages/x86_64/directfb +++ /dev/null @@ -1,397 +0,0 @@ -usr/bin/dfbdump -usr/bin/dfbdumpinput -usr/bin/dfbfx -usr/bin/dfbg -usr/bin/dfbinfo -usr/bin/dfbinput -usr/bin/dfbinspector -usr/bin/dfblayer -usr/bin/dfbmaster -usr/bin/dfbpenmount -usr/bin/dfbplay -usr/bin/dfbscreen -usr/bin/dfbshow -usr/bin/dfbswitch -usr/bin/directfb-config -usr/bin/directfb-csource -usr/bin/mkdfiff -usr/bin/mkdgiff -usr/bin/mkdgifft -usr/bin/pxa3xx_dump -#usr/include/++dfb -#usr/include/++dfb/++dfb.h -#usr/include/++dfb/++dfb_mangle.h -#usr/include/++dfb/++dfb_unmangle.h -#usr/include/++dfb/idirectfb.h -#usr/include/++dfb/idirectfbdatabuffer.h -#usr/include/++dfb/idirectfbdisplaylayer.h -#usr/include/++dfb/idirectfbeventbuffer.h -#usr/include/++dfb/idirectfbfont.h -#usr/include/++dfb/idirectfbimageprovider.h -#usr/include/++dfb/idirectfbinputdevice.h -#usr/include/++dfb/idirectfbpalette.h -#usr/include/++dfb/idirectfbscreen.h -#usr/include/++dfb/idirectfbsurface.h -#usr/include/++dfb/idirectfbvideoprovider.h -#usr/include/++dfb/idirectfbwindow.h -#usr/include/directfb -#usr/include/directfb-internal -#usr/include/directfb-internal/core -#usr/include/directfb-internal/core/CoreDFB.h -#usr/include/directfb-internal/core/CoreDFB_CallMode.h -#usr/include/directfb-internal/core/CoreDFB_includes.h -#usr/include/directfb-internal/core/CoreGraphicsState.h -#usr/include/directfb-internal/core/CoreGraphicsStateClient.h -#usr/include/directfb-internal/core/CoreGraphicsState_includes.h -#usr/include/directfb-internal/core/CoreInputDevice.h -#usr/include/directfb-internal/core/CoreInputDevice_includes.h -#usr/include/directfb-internal/core/CoreLayer.h -#usr/include/directfb-internal/core/CoreLayerContext.h -#usr/include/directfb-internal/core/CoreLayerContext_includes.h -#usr/include/directfb-internal/core/CoreLayerRegion.h -#usr/include/directfb-internal/core/CoreLayerRegion_includes.h -#usr/include/directfb-internal/core/CoreLayer_includes.h -#usr/include/directfb-internal/core/CorePalette.h -#usr/include/directfb-internal/core/CorePalette_includes.h -#usr/include/directfb-internal/core/CoreScreen.h -#usr/include/directfb-internal/core/CoreScreen_includes.h -#usr/include/directfb-internal/core/CoreSlave.h -#usr/include/directfb-internal/core/CoreSlave_includes.h -#usr/include/directfb-internal/core/CoreSurface.h -#usr/include/directfb-internal/core/CoreSurfaceClient.h -#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h -#usr/include/directfb-internal/core/CoreSurface_includes.h -#usr/include/directfb-internal/core/CoreWindow.h -#usr/include/directfb-internal/core/CoreWindowStack.h -#usr/include/directfb-internal/core/CoreWindowStack_includes.h -#usr/include/directfb-internal/core/CoreWindow_includes.h -#usr/include/directfb-internal/core/Debug.h -#usr/include/directfb-internal/core/DisplayTask.h -#usr/include/directfb-internal/core/Fifo.h -#usr/include/directfb-internal/core/Interface.h -#usr/include/directfb-internal/core/PacketBuffer.h -#usr/include/directfb-internal/core/Renderer.h -#usr/include/directfb-internal/core/SurfaceTask.h -#usr/include/directfb-internal/core/Task.h -#usr/include/directfb-internal/core/TaskManager.h -#usr/include/directfb-internal/core/TaskThreadsQ.h -#usr/include/directfb-internal/core/Util.h -#usr/include/directfb-internal/core/clipboard.h -#usr/include/directfb-internal/core/colorhash.h -#usr/include/directfb-internal/core/core.h -#usr/include/directfb-internal/core/core_parts.h -#usr/include/directfb-internal/core/core_strings.h -#usr/include/directfb-internal/core/core_system.h -#usr/include/directfb-internal/core/coredefs.h -#usr/include/directfb-internal/core/coretypes.h -#usr/include/directfb-internal/core/fonts.h -#usr/include/directfb-internal/core/gfxcard.h -#usr/include/directfb-internal/core/graphics_driver.h -#usr/include/directfb-internal/core/graphics_state.h -#usr/include/directfb-internal/core/input.h -#usr/include/directfb-internal/core/input_driver.h -#usr/include/directfb-internal/core/input_hub.h -#usr/include/directfb-internal/core/layer_context.h -#usr/include/directfb-internal/core/layer_control.h -#usr/include/directfb-internal/core/layer_region.h -#usr/include/directfb-internal/core/layers.h -#usr/include/directfb-internal/core/layers_internal.h -#usr/include/directfb-internal/core/palette.h -#usr/include/directfb-internal/core/screen.h -#usr/include/directfb-internal/core/screens.h -#usr/include/directfb-internal/core/screens_internal.h -#usr/include/directfb-internal/core/state.h -#usr/include/directfb-internal/core/surface.h -#usr/include/directfb-internal/core/surface_allocation.h -#usr/include/directfb-internal/core/surface_buffer.h -#usr/include/directfb-internal/core/surface_client.h -#usr/include/directfb-internal/core/surface_core.h -#usr/include/directfb-internal/core/surface_pool.h -#usr/include/directfb-internal/core/surface_pool_bridge.h -#usr/include/directfb-internal/core/system.h -#usr/include/directfb-internal/core/windows.h -#usr/include/directfb-internal/core/windows_internal.h -#usr/include/directfb-internal/core/windowstack.h -#usr/include/directfb-internal/core/wm.h -#usr/include/directfb-internal/core/wm_module.h -#usr/include/directfb-internal/devmem -#usr/include/directfb-internal/devmem/devmem.h -#usr/include/directfb-internal/devmem/surfacemanager.h -#usr/include/directfb-internal/display -#usr/include/directfb-internal/display/idirectfbdisplaylayer.h -#usr/include/directfb-internal/display/idirectfbpalette.h -#usr/include/directfb-internal/display/idirectfbscreen.h -#usr/include/directfb-internal/display/idirectfbsurface.h -#usr/include/directfb-internal/display/idirectfbsurface_layer.h -#usr/include/directfb-internal/display/idirectfbsurface_window.h -#usr/include/directfb-internal/dummy -#usr/include/directfb-internal/dummy/dummy.h -#usr/include/directfb-internal/fbdev -#usr/include/directfb-internal/fbdev/agp.h -#usr/include/directfb-internal/fbdev/fb.h -#usr/include/directfb-internal/fbdev/fbdev.h -#usr/include/directfb-internal/fbdev/surfacemanager.h -#usr/include/directfb-internal/fbdev/vt.h -#usr/include/directfb-internal/gfx -#usr/include/directfb-internal/gfx/clip.h -#usr/include/directfb-internal/gfx/convert.h -#usr/include/directfb-internal/gfx/generic -#usr/include/directfb-internal/gfx/generic/generic.h -#usr/include/directfb-internal/gfx/util.h -#usr/include/directfb-internal/idirectfb.h -#usr/include/directfb-internal/init.h -#usr/include/directfb-internal/input -#usr/include/directfb-internal/input/idirectfbinputbuffer.h -#usr/include/directfb-internal/input/idirectfbinputdevice.h -#usr/include/directfb-internal/media -#usr/include/directfb-internal/media/idirectfbdatabuffer.h -#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h -#usr/include/directfb-internal/media/idirectfbfont.h -#usr/include/directfb-internal/media/idirectfbimageprovider.h -#usr/include/directfb-internal/media/idirectfbimageprovider_client.h -#usr/include/directfb-internal/media/idirectfbvideoprovider.h -#usr/include/directfb-internal/misc -#usr/include/directfb-internal/misc/conf.h -#usr/include/directfb-internal/misc/gfx_util.h -#usr/include/directfb-internal/misc/util.h -#usr/include/directfb-internal/windows -#usr/include/directfb-internal/windows/idirectfbwindow.h -#usr/include/directfb/dfb_types.h -#usr/include/directfb/dfiff.h -#usr/include/directfb/dgiff.h -#usr/include/directfb/direct -#usr/include/directfb/direct/Lists.h -#usr/include/directfb/direct/LockWQ.h -#usr/include/directfb/direct/Magic.h -#usr/include/directfb/direct/Mutex.h -#usr/include/directfb/direct/Performer.h -#usr/include/directfb/direct/String.h -#usr/include/directfb/direct/TLSObject.h -#usr/include/directfb/direct/ToString.h -#usr/include/directfb/direct/Types++.h -#usr/include/directfb/direct/atomic.h -#usr/include/directfb/direct/build.h -#usr/include/directfb/direct/clock.h -#usr/include/directfb/direct/compiler.h -#usr/include/directfb/direct/conf.h -#usr/include/directfb/direct/debug.h -#usr/include/directfb/direct/direct.h -#usr/include/directfb/direct/fastlz.h -#usr/include/directfb/direct/fifo.h -#usr/include/directfb/direct/filesystem.h -#usr/include/directfb/direct/flz.h -#usr/include/directfb/direct/hash.h -#usr/include/directfb/direct/init.h -#usr/include/directfb/direct/interface.h -#usr/include/directfb/direct/interface_implementation.h -#usr/include/directfb/direct/list.h -#usr/include/directfb/direct/log.h -#usr/include/directfb/direct/log_domain.h -#usr/include/directfb/direct/map.h -#usr/include/directfb/direct/mem.h -#usr/include/directfb/direct/memcpy.h -#usr/include/directfb/direct/messages.h -#usr/include/directfb/direct/modules.h -#usr/include/directfb/direct/os -#usr/include/directfb/direct/os/clock.h -#usr/include/directfb/direct/os/filesystem.h -#usr/include/directfb/direct/os/linux -#usr/include/directfb/direct/os/linux/glibc -#usr/include/directfb/direct/os/linux/glibc/filesystem.h -#usr/include/directfb/direct/os/linux/glibc/mutex.h -#usr/include/directfb/direct/os/linux/glibc/thread.h -#usr/include/directfb/direct/os/linux/glibc/types.h -#usr/include/directfb/direct/os/linux/glibc/waitqueue.h -#usr/include/directfb/direct/os/log.h -#usr/include/directfb/direct/os/mem.h -#usr/include/directfb/direct/os/mutex.h -#usr/include/directfb/direct/os/signals.h -#usr/include/directfb/direct/os/system.h -#usr/include/directfb/direct/os/thread.h -#usr/include/directfb/direct/os/types.h -#usr/include/directfb/direct/os/waitqueue.h -#usr/include/directfb/direct/perf.h -#usr/include/directfb/direct/print.h -#usr/include/directfb/direct/processor.h -#usr/include/directfb/direct/result.h -#usr/include/directfb/direct/serial.h -#usr/include/directfb/direct/signals.h -#usr/include/directfb/direct/stream.h -#usr/include/directfb/direct/system.h -#usr/include/directfb/direct/thread.h -#usr/include/directfb/direct/trace.h -#usr/include/directfb/direct/tree.h -#usr/include/directfb/direct/types.h -#usr/include/directfb/direct/utf8.h -#usr/include/directfb/direct/util.h -#usr/include/directfb/direct/uuid.h -#usr/include/directfb/directfb++.h -#usr/include/directfb/directfb.h -#usr/include/directfb/directfb_build.h -#usr/include/directfb/directfb_graphics.h -#usr/include/directfb/directfb_keyboard.h -#usr/include/directfb/directfb_keynames.h -#usr/include/directfb/directfb_strings.h -#usr/include/directfb/directfb_util.h -#usr/include/directfb/directfb_version.h -#usr/include/directfb/directfb_water.h -#usr/include/directfb/directfb_water_strings.h -#usr/include/directfb/directfb_windows.h -#usr/include/directfb/directfbgl.h -#usr/include/directfb/directfbgl2.h -#usr/include/directfb/fusion -#usr/include/directfb/fusion/Debug.h -#usr/include/directfb/fusion/arena.h -#usr/include/directfb/fusion/build.h -#usr/include/directfb/fusion/call.h -#usr/include/directfb/fusion/conf.h -#usr/include/directfb/fusion/fusion.h -#usr/include/directfb/fusion/fusion_internal.h -#usr/include/directfb/fusion/hash.h -#usr/include/directfb/fusion/init.h -#usr/include/directfb/fusion/lock.h -#usr/include/directfb/fusion/object.h -#usr/include/directfb/fusion/property.h -#usr/include/directfb/fusion/protocol.h -#usr/include/directfb/fusion/reactor.h -#usr/include/directfb/fusion/ref.h -#usr/include/directfb/fusion/shm -#usr/include/directfb/fusion/shm/pool.h -#usr/include/directfb/fusion/shm/shm.h -#usr/include/directfb/fusion/shm/shm_internal.h -#usr/include/directfb/fusion/shmalloc.h -#usr/include/directfb/fusion/types.h -#usr/include/directfb/fusion/vector.h -#usr/lib/directfb-1.7-7 -#usr/lib/directfb-1.7-7/gfxdrivers -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so -#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la -usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so -#usr/lib/directfb-1.7-7/inputdrivers -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so -#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la -usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so -#usr/lib/directfb-1.7-7/interfaces -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager -#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la -usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows -#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la -usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so -#usr/lib/directfb-1.7-7/interfaces/IWater -#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la -usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so -#usr/lib/directfb-1.7-7/systems -#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la -usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la -usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la -usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so -#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la -usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so -#usr/lib/directfb-1.7-7/wm -#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la -usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so -usr/lib/lib++dfb-1.7.so.7 -usr/lib/lib++dfb-1.7.so.7.0.0 -#usr/lib/lib++dfb.la -#usr/lib/lib++dfb.so -usr/lib/libdirect-1.7.so.7 -usr/lib/libdirect-1.7.so.7.0.0 -#usr/lib/libdirect.la -usr/lib/libdirect.so -usr/lib/libdirectfb-1.7.so.7 -usr/lib/libdirectfb-1.7.so.7.0.0 -#usr/lib/libdirectfb.la -usr/lib/libdirectfb.so -usr/lib/libfusion-1.7.so.7 -usr/lib/libfusion-1.7.so.7.0.0 -#usr/lib/libfusion.la -usr/lib/libfusion.so -#usr/lib/pkgconfig/++dfb.pc -#usr/lib/pkgconfig/direct.pc -#usr/lib/pkgconfig/directfb-internal.pc -#usr/lib/pkgconfig/directfb.pc -#usr/lib/pkgconfig/fusion.pc -#usr/share/directfb-1.7.7 -#usr/share/directfb-1.7.7/cursor.dat -#usr/share/directfb-1.7.7/cursor.png -#usr/share/directfb-1.7.7/decker.dgiff -#usr/share/directfb-1.7.7/decker.ttf -#usr/share/man/man1/dfbg.1 -#usr/share/man/man1/directfb-csource.1 -#usr/share/man/man5/directfbrc.5 diff --git a/lfs/arm b/lfs/arm deleted file mode 100644 index a8fae41df..000000000 --- a/lfs/arm +++ /dev/null @@ -1,83 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.4.5.0 - -THISAPP = arm-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/arm -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = arm -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = f85f306e50b90796ab7097d948e8fcf2 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/arm-dont-require-distutils.patch - cd $(DIR_APP) && ./install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/batctl b/lfs/batctl deleted file mode 100644 index 36401609c..000000000 --- a/lfs/batctl +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2014.3.0 - -THISAPP = batctl-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 7d2b8c129424c014d020c4b1a2add31b - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install PREFIX=/usr - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/bitstream b/lfs/bitstream deleted file mode 100644 index f0ff34b09..000000000 --- a/lfs/bitstream +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.0 - -THISAPP = bitstream-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = bitstream -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 5ba0c96d6c7c9131ba60a9a8fc147556 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bitstream-makefile.patch - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent deleted file mode 100644 index ab7f1da95..000000000 --- a/lfs/check_mk_agent +++ /dev/null @@ -1,86 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.2.4p5 - -THISAPP = check_mk_agent-$(VER) -DL_FILE = check_mk-${VER}.tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/check_mk-${VER} -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = check_mk_agent -PAK_VER = 4 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = ef3055d191bd38295d1716b3f7824115 - -install : $(TARGET) -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist : - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && tar xzf agents.tar.gz - cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent - -mkdir /etc/xinetd.d - cd $(DIR_APP) && install -v -m 755 xinetd.conf /etc/xinetd.d/check_mk_agent - cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax - cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/directfb b/lfs/directfb deleted file mode 100644 index 8b2ff6022..000000000 --- a/lfs/directfb +++ /dev/null @@ -1,93 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.7.7 - -THISAPP = DirectFB-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = directfb -PAK_VER = 3 - -DEPS = "" - - - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 152cf1863b1a3a28aa1370e9053440bf - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/DirectFB-1.7.7-fix_mknod.patch - - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --disable-x11 \ - --enable-sdl \ - --enable-video4linux2 - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/ez-ipupdate b/lfs/ez-ipupdate deleted file mode 100644 index bd2523607..000000000 --- a/lfs/ez-ipupdate +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 3.0.11b8 - -THISAPP = ez-ipupdate-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 000211add4c4845ffa4211841bff4fb0 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ez-ipupdate.formstring.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/icecast b/lfs/icecast deleted file mode 100644 index c59fba8f3..000000000 --- a/lfs/icecast +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.3.2 - -THISAPP = icecast-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = icecast -PAK_VER = 3 - -DEPS = "libshout lame sox libvorbis libogg" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = ff516b3ccd2bcc31e68f460cd316093f - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/icegenerator b/lfs/icegenerator deleted file mode 100644 index 84cede07a..000000000 --- a/lfs/icegenerator +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.5.5-pre2 - -THISAPP = icegenerator-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = icegenerator -PAK_VER = 1 - -DEPS = "icecast" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 71515d79bc43ca53baffc96c4ada946a - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --with-id3 - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/multicat b/lfs/multicat deleted file mode 100644 index 827ff8efc..000000000 --- a/lfs/multicat +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.0 - -THISAPP = multicat-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = multicat -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 3aaa226a421c378c2ede0c8db8fd609c - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/multicat-makefile.patch - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/rtpproxy b/lfs/rtpproxy deleted file mode 100644 index 204f44bca..000000000 --- a/lfs/rtpproxy +++ /dev/null @@ -1,87 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.0.0 - -THISAPP = rtpproxy-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = rtpproxy -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 8d36fcc1dd93994ac5376d145f19ac73 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - #install initscripts - $(call INSTALL_INITSCRIPT,rtpproxy) - @rm -rf $(DIR_APP) - @$(POSTBUILD) - diff --git a/lfs/setserial b/lfs/setserial deleted file mode 100644 index 739e7f686..000000000 --- a/lfs/setserial +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.17 - -THISAPP = setserial-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = c4867d72c41564318e0107745eb7a0f2 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/streamripper b/lfs/streamripper deleted file mode 100644 index 223152acd..000000000 --- a/lfs/streamripper +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.63.5 - -THISAPP = streamripper-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = streamripper -PAK_VER = 1 - -DEPS = "libmad libogg libvorbis faad2" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 73a63383dca00615c3328cf51bf2fa56 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -dist: - @$(PAK) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index c0137ecc0..855ec30e1 100755 --- a/make.sh +++ b/make.sh @@ -1287,7 +1287,6 @@ buildipfire() { lfsmake2 fuse lfsmake2 ntfs-3g lfsmake2 ethtool - lfsmake2 ez-ipupdate lfsmake2 fcron lfsmake2 perl-GD lfsmake2 GD-Graph @@ -1361,7 +1360,6 @@ buildipfire() { lfsmake2 cairo lfsmake2 pango lfsmake2 rrdtool - lfsmake2 setserial lfsmake2 setup lfsmake2 libdnet lfsmake2 rust @@ -1474,7 +1472,6 @@ buildipfire() { lfsmake2 icinga lfsmake2 observium-agent lfsmake2 ebtables - lfsmake2 directfb lfsmake2 faad2 lfsmake2 alac lfsmake2 ffmpeg @@ -1484,8 +1481,6 @@ buildipfire() { lfsmake2 vdr_dvbapi lfsmake2 vdr_eepg lfsmake2 w_scan - lfsmake2 icecast - lfsmake2 icegenerator lfsmake2 mpd lfsmake2 libmpdclient lfsmake2 mpc @@ -1513,7 +1508,6 @@ buildipfire() { lfsmake2 iperf3 lfsmake2 7zip lfsmake2 lynis - lfsmake2 streamripper lfsmake2 sshfs lfsmake2 taglib lfsmake2 sslh @@ -1585,7 +1579,6 @@ buildipfire() { lfsmake2 stress lfsmake2 libstatgrab lfsmake2 sarg - lfsmake2 check_mk_agent lfsmake2 nginx lfsmake2 sendEmail lfsmake2 sysbench @@ -1593,8 +1586,6 @@ buildipfire() { lfsmake2 ltrace lfsmake2 ipfire-netboot lfsmake2 lcdproc - lfsmake2 bitstream - lfsmake2 multicat lfsmake2 keepalived lfsmake2 ipvsadm lfsmake2 perl-Carp-Clan @@ -1604,13 +1595,11 @@ buildipfire() { lfsmake2 perl-TimeDate lfsmake2 swatch lfsmake2 tor - lfsmake2 arm lfsmake2 wavemon lfsmake2 iptraf-ng lfsmake2 iotop lfsmake2 stunnel lfsmake2 bacula - lfsmake2 batctl lfsmake2 perl-Font-TTF lfsmake2 perl-IO-String lfsmake2 perl-PDF-API2 @@ -1626,7 +1615,6 @@ buildipfire() { lfsmake2 frr lfsmake2 dmidecode lfsmake2 mcelog - lfsmake2 rtpproxy lfsmake2 util-macros lfsmake2 libpciaccess lfsmake2 libyajl diff --git a/src/initscripts/packages/rtpproxy b/src/initscripts/packages/rtpproxy deleted file mode 100755 index 3ea72f5f0..000000000 --- a/src/initscripts/packages/rtpproxy +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/rtpproxy -# -# Description : -# -# Authors : -# -# Version : 00.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - -PORT_MIN=10000 -PORT_MAX=10100 -SOCKET="/var/run/rtpproxy.sock" -LISTEN="${GREEN_ADDRESS}" -CUSTOM_ARGS="" - -PIDFILE="/var/run/rtpproxy.pid" - -if [ -r "/etc/sysconfig/rtpproxy" ]; then - . /etc/sysconfig/rtpproxy -fi - -case "${1}" in - start) - boot_mesg "Starting rtpproxy..." - loadproc /usr/bin/rtpproxy -u nobody -p ${PIDFILE} \ - -m ${PORT_MIN} -M ${PORT_MAX} -s ${SOCKET} \ - -l ${LISTEN} ${CUSTOM_ARGS} - ;; - - stop) - boot_mesg "Stopping rtpproxy..." - killproc /usr/bin/rtpproxy - ;; - - reload) - boot_mesg "Reloading rtpproxy..." - reloadproc /usr/bin/rtpproxy - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc /usr/bin/rtpproxy - ;; - - *) - echo "Usage: ${0} {start|stop|reload|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/rtpproxy diff --git a/src/paks/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh deleted file mode 100644 index 6aed752a8..000000000 --- a/src/paks/check_mk_agent/install.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} - -mkdir -p /usr/lib/check_mk_agent/plugins - -if [[ -x /usr/sbin/xinetd ]]; -then - if [[ -x /etc/init.d/xinetd ]] - then - /etc/init.d/xinetd restart - fi -fi diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh deleted file mode 100644 index 51449f55b..000000000 --- a/src/paks/check_mk_agent/uninstall.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_backup_includes -make_backup ${NAME} -remove_files - -if [[ -x /usr/sbin/xinetd ]]; -then - if [[ -x /etc/init.d/xinetd ]] - then - /etc/init.d/xinetd restart - fi -fi diff --git a/src/paks/check_mk_agent/update.sh b/src/paks/check_mk_agent/update.sh deleted file mode 100644 index 89c40d0d7..000000000 --- a/src/paks/check_mk_agent/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/paks/rtpproxy/install.sh b/src/paks/rtpproxy/install.sh deleted file mode 100644 index 02a521998..000000000 --- a/src/paks/rtpproxy/install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -start_service ${NAME} -ln -svf ../init.d/rtpproxy /etc/rc.d/rc0.d/K00rtpproxy -ln -svf ../init.d/rtpproxy /etc/rc.d/rc3.d/S99rtpproxy -ln -svf ../init.d/rtpproxy /etc/rc.d/rc6.d/K00rtpproxy diff --git a/src/paks/rtpproxy/uninstall.sh b/src/paks/rtpproxy/uninstall.sh deleted file mode 100644 index e9076d104..000000000 --- a/src/paks/rtpproxy/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -remove_files -rm -rf /etc/rc.d/rc*.d/*rtpproxy diff --git a/src/paks/rtpproxy/update.sh b/src/paks/rtpproxy/update.sh deleted file mode 100644 index 89c40d0d7..000000000 --- a/src/paks/rtpproxy/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch b/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch deleted file mode 100644 index 078754ef3..000000000 --- a/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch +++ /dev/null @@ -1,1717 +0,0 @@ -From: Sebastian Ramacher <sramacher(a)debian.org> -Date: Thu, 16 Mar 2017 20:53:09 +0100 -Subject: Add missing files from upstream - -Closes: #598976 ---- - gfxdrivers/davinci/davinci_c64x.h | 935 +++++++++++++++++++++++++++++++++ - gfxdrivers/davinci/davinci_gfxdriver.h | 169 ++++++ - gfxdrivers/davinci/davincifb.h | 581 ++++++++++++++++++++ - 3 files changed, 1685 insertions(+) - create mode 100644 gfxdrivers/davinci/davinci_c64x.h - create mode 100644 gfxdrivers/davinci/davinci_gfxdriver.h - create mode 100644 gfxdrivers/davinci/davincifb.h - -diff --git a/gfxdrivers/davinci/davinci_c64x.h b/gfxdrivers/davinci/davinci_c64x.h -new file mode 100644 -index 0000000..682da22 ---- /dev/null -+++ b/gfxdrivers/davinci/davinci_c64x.h -@@ -0,0 +1,935 @@ -+/* -+ TI Davinci driver - C64X+ DSP Library -+ -+ (c) Copyright 2008 directfb.org -+ (c) Copyright 2007 Telio AG -+ -+ Written by Denis Oliver Kropp <dok(a)directfb.org> and -+ Olaf Dreesen <olaf(a)directfb.org>. -+ -+ All rights reserved. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License -+ version 2 as published by the Free Software Foundation. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __DAVINCI_C64X_H__ -+#define __DAVINCI_C64X_H__ -+ -+#include <unistd.h> -+ -+#include <directfb.h> -+ -+#include <direct/messages.h> -+#include <direct/trace.h> -+ -+#include <linux/c64x.h> -+ -+#define mb() __asm__ __volatile__ ("" : : : "memory") -+ -+/**********************************************************************************************************************/ -+ -+typedef struct { -+ int magic; -+ -+ int fd; -+ c64xTaskControl *ctl; -+ void *mem; -+ -+ c64xTask *QueueL; -+} DavinciC64x; -+ -+typedef struct { -+ int magic; -+ unsigned int max_tasks; -+ unsigned int num_tasks; -+ c64xTask *tasks; -+} DavinciC64xTasks; -+ -+typedef enum { -+ C64X_TEF_NONE = 0x0000, -+ C64X_TEF_RESET = 0x0001 -+} DavinciC64xEmitFlags; -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_open ( DavinciC64x *c64x ); -+ -+DFBResult davinci_c64x_close ( DavinciC64x *c64x ); -+ -+DFBResult davinci_c64x_wait_low( DavinciC64x *c64x ); -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_tasks_init ( DavinciC64xTasks *tasks, -+ unsigned int size ); -+ -+DFBResult davinci_c64x_tasks_destroy( DavinciC64xTasks *tasks ); -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_emit_tasks( DavinciC64x *c64x, -+ DavinciC64xTasks *tasks, -+ DavinciC64xEmitFlags flags ); -+ -+/**********************************************************************************************************************/ -+ -+static const char *state_names[] = { "DONE", "ERROR", "TODO", "RUNNING" }; -+ -+static inline c64xTask * -+c64x_get_task( DavinciC64x *c64x ) -+{ -+ c64xTaskControl *ctl = c64x->ctl; -+ uint32_t idx = ctl->QL_arm; -+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK; -+ c64xTask *task = &c64x->QueueL[idx]; -+ int loops = 0; -+ uint32_t idle = 0; -+ -+ /* Wait for the entry (and next) to be processed by the DSP (rare case). */ -+ while (task->c64x_flags & C64X_FLAG_TODO || ctl->QL_dsp == next) { -+ if (loops > 666 || (idle && ctl->idlecounter - idle > 666)) { -+ c64xTask *dsp_task = &c64x->QueueL[ctl->QL_dsp]; -+ -+ D_PERROR( "Davinci/C64X+: Blocked! [DSP %d / %d (%s), ARM %d / %d (%s)]\n", -+ ctl->QL_dsp, -+ (dsp_task->c64x_function >> 2) & 0x3fff, -+ state_names[dsp_task->c64x_function & 3], -+ ctl->QL_arm, -+ (task->c64x_function >> 2) & 0x3fff, -+ state_names[task->c64x_function & 3] ); -+ -+ break; -+ } -+ -+ idle = ctl->idlecounter; -+ -+ /* Queue is full, waiting 10-20ms should not be too bad. */ -+ if (loops++ > 10) -+ usleep( 5000 ); -+ } -+ -+ return task; -+} -+ -+static inline void -+c64x_submit_task( DavinciC64x *c64x, c64xTask *task ) -+{ -+ c64xTaskControl *ctl = c64x->ctl; -+ uint32_t idx = ctl->QL_arm; -+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK; -+ -+ mb(); -+ -+ ctl->QL_arm = next; -+ -+ mb(); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_wb_inv_range( DavinciC64x *c64x, -+ unsigned long start, -+ u32 length, -+ u32 func ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = start; -+ task->c64x_arg[1] = length; -+ task->c64x_arg[2] = func; -+ -+ task->c64x_function = C64X_WB_INV_RANGE | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_write_back_all( DavinciC64x *c64x ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_function = C64X_WRITE_BACK_ALL | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_load_block__L( DavinciC64xTasks *tasks, -+ unsigned long words, -+ u32 num, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = words; -+ task->c64x_arg[1] = num; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_load_block( DavinciC64x *c64x, -+ unsigned long words, -+ u32 num, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = words; -+ task->c64x_arg[1] = num; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fetch_uyvy( DavinciC64x *c64x, -+ unsigned long dest, -+ unsigned long source, -+ u32 pitch, -+ u32 height, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = source; -+ task->c64x_arg[2] = pitch; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_FETCH_UYVY | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_mc( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long source0, -+ unsigned long source1, -+ u32 spitch, -+ u32 height, -+ int func ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = source0; -+ task->c64x_arg[3] = source1; -+ task->c64x_arg[4] = spitch; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = func | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_idct_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_idct_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_mc_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_mc_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_sum_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_sum_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dva_begin_frame__L( DavinciC64xTasks *tasks, -+ u32 pitch, -+ unsigned long current, -+ unsigned long past, -+ unsigned long future, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = pitch; -+ task->c64x_arg[1] = current; -+ task->c64x_arg[2] = past; -+ task->c64x_arg[3] = future; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dva_begin_frame( DavinciC64x *c64x, -+ u32 pitch, -+ unsigned long current, -+ unsigned long past, -+ unsigned long future, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = pitch; -+ task->c64x_arg[1] = current; -+ task->c64x_arg[2] = past; -+ task->c64x_arg[3] = future; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dva_motion_block__L( DavinciC64xTasks *tasks, -+ unsigned long macroblock ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = macroblock; -+ -+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dva_motion_block( DavinciC64x *c64x, -+ unsigned long macroblock ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = macroblock; -+ -+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_dva_idct( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ unsigned long source ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = source; -+ -+ task->c64x_function = C64X_DVA_IDCT | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_put_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ unsigned long source, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = source; -+ task->c64x_arg[3] = flags; -+ -+ task->c64x_function = C64X_PUT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dither_argb__L( DavinciC64xTasks *tasks, -+ unsigned long dst_rgb, -+ unsigned long dst_alpha, -+ u32 dst_pitch, -+ unsigned long source, -+ u32 src_pitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dst_rgb; -+ task->c64x_arg[1] = dst_alpha; -+ task->c64x_arg[2] = dst_pitch; -+ task->c64x_arg[3] = source; -+ task->c64x_arg[4] = src_pitch; -+ task->c64x_arg[5] = width; -+ task->c64x_arg[6] = height; -+ -+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dither_argb( DavinciC64x *c64x, -+ unsigned long dst_rgb, -+ unsigned long dst_alpha, -+ u32 dst_pitch, -+ unsigned long source, -+ u32 src_pitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dst_rgb; -+ task->c64x_arg[1] = dst_alpha; -+ task->c64x_arg[2] = dst_pitch; -+ task->c64x_arg[3] = source; -+ task->c64x_arg[4] = src_pitch; -+ task->c64x_arg[5] = width; -+ task->c64x_arg[6] = height; -+ -+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fill_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_fill_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fill_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_fill_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_stretch_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 dw, -+ u32 dh, -+ u32 sw, -+ u32 sh, -+ const DFBRegion *clip ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = src; -+ task->c64x_arg[2] = dpitch | (spitch << 16); -+ task->c64x_arg[3] = dh | (dw << 16); -+ task->c64x_arg[4] = sh | (sw << 16); -+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16); -+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16); -+ -+ if (sw > dw && sh > dh) -+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO; -+ else -+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_stretch_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 dw, -+ u32 dh, -+ u32 sw, -+ u32 sh, -+ const DFBRegion *clip ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = src; -+ task->c64x_arg[2] = dpitch | (spitch << 16); -+ task->c64x_arg[3] = dh | (dw << 16); -+ task->c64x_arg[4] = sh | (sw << 16); -+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16); -+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16); -+ -+ if (sw > dw && sh > dh) -+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO; -+ else -+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_blend_32__L( DavinciC64xTasks *tasks, -+ u32 sub_func, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 argb, -+ u8 alpha ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width | (height << 16); -+ task->c64x_arg[5] = argb; -+ task->c64x_arg[6] = alpha; -+ -+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_blend_32( DavinciC64x *c64x, -+ u32 sub_func, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 argb, -+ u8 alpha ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width | (height << 16); -+ task->c64x_arg[5] = argb; -+ task->c64x_arg[6] = alpha; -+ -+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_keyed_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_keyed_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_keyed_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_keyed_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+#endif -+ -diff --git a/gfxdrivers/davinci/davinci_gfxdriver.h b/gfxdrivers/davinci/davinci_gfxdriver.h -new file mode 100644 -index 0000000..4ca79b3 ---- /dev/null -+++ b/gfxdrivers/davinci/davinci_gfxdriver.h -@@ -0,0 +1,169 @@ -+/* -+ TI Davinci driver - Graphics Driver -+ -+ (c) Copyright 2007 Telio AG -+ -+ Written by Denis Oliver Kropp <dok(a)directfb.org> -+ -+ Code is derived from VMWare driver. -+ -+ (c) Copyright 2001-2009 The world wide DirectFB Open Source Community (directfb.org) -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH -+ -+ All rights reserved. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __DAVINCI_GFXDRIVER_H__ -+#define __DAVINCI_GFXDRIVER_H__ -+ -+#include <sys/ioctl.h> -+#include <davincifb.h> -+ -+#include <core/surface_buffer.h> -+ -+#include "davincifb.h" -+ -+#include "davinci_c64x.h" -+ -+ -+typedef struct { -+ /* validation flags */ -+ int v_flags; -+ -+ /* cached/computed values */ -+ void *dst_addr; -+ unsigned long dst_phys; -+ unsigned int dst_size; -+ unsigned long dst_pitch; -+ DFBSurfacePixelFormat dst_format; -+ unsigned long dst_bpp; -+ -+ void *src_addr; -+ unsigned long src_phys; -+ unsigned long src_pitch; -+ DFBSurfacePixelFormat src_format; -+ unsigned long src_bpp; -+ -+ unsigned long source_mult; -+ -+ unsigned long fillcolor; -+ -+ int blit_blend_sub_function; -+ int draw_blend_sub_function; -+ -+ DFBColor color; -+ unsigned long color_argb; -+ unsigned long colorkey; -+ -+ DFBSurfaceBlittingFlags blitting_flags; -+ -+ DFBRegion clip; -+ -+ /** Add shared data here... **/ -+ struct fb_fix_screeninfo fix[4]; -+ -+ CoreSurfacePool *osd_pool; -+ CoreSurfacePool *video_pool; -+ -+ bool synced; -+} DavinciDeviceData; -+ -+ -+typedef struct { -+ int num; -+ int fd; -+ void *mem; -+ int size; -+} DavinciFB; -+ -+typedef struct { -+ DavinciDeviceData *ddev; -+ -+ CoreDFB *core; -+ -+ CoreScreen *screen; -+ CoreLayer *osd; -+ CoreLayer *video; -+ -+ DavinciFB fb[4]; -+ -+ DavinciC64x c64x; -+ bool c64x_present; -+ -+ DavinciC64xTasks tasks; -+} DavinciDriverData; -+ -+ -+static inline DFBResult -+davincifb_pan_display( const DavinciFB *fb, -+ struct fb_var_screeninfo *var, -+ const CoreSurfaceBufferLock *lock, -+ DFBSurfaceFlipFlags flags, -+ int x, -+ int y ) -+{ -+ int ret; -+ -+ if (lock) { -+#ifdef FBIO_SET_START -+ CoreSurfaceBuffer *buffer = lock->buffer; -+ struct fb_set_start set_start; -+ -+ /* physical mode */ -+ set_start.offset = -1; -+ set_start.sync = (flags & DSFLIP_ONSYNC) ? 1 : 0; -+ -+ /* life's so easy */ -+ set_start.physical = lock->phys + DFB_BYTES_PER_LINE( buffer->format, x ) + y * lock->pitch; -+ -+ ret = ioctl( fb->fd, FBIO_SET_START, &set_start ); -+ if (ret < 0) -+ D_DEBUG( "FBIO_SET_START (0x%08lx, sync %llu) failed!\n", -+ set_start.physical, set_start.sync ); -+ -+ if (ret == 0) { -+ if (flags & DSFLIP_WAIT) -+ ioctl( fb->fd, FBIO_WAITFORVSYNC ); -+ -+ return DFB_OK; -+ } -+ -+ /* fallback */ -+#endif -+ var->xoffset = x; /* poor version */ -+ var->yoffset = y + lock->offset / lock->pitch; -+ } -+ else { -+ var->xoffset = x; -+ var->yoffset = y; -+ } -+ -+ var->activate = /*(flags & DSFLIP_ONSYNC) ? FB_ACTIVATE_VBL :*/ FB_ACTIVATE_NOW; -+ -+ ret = ioctl( fb->fd, FBIOPAN_DISPLAY, var ); -+ if (ret) -+ D_PERROR( "Davinci/FB: FBIOPAN_DISPLAY (fb%d - %d,%d) failed!\n", -+ fb->num, var->xoffset, var->yoffset ); -+ -+ if (flags & DSFLIP_WAIT) -+ ioctl( fb->fd, FBIO_WAITFORVSYNC ); -+ -+ return DFB_OK; -+} -+ -+#endif -diff --git a/gfxdrivers/davinci/davincifb.h b/gfxdrivers/davinci/davincifb.h -new file mode 100644 -index 0000000..35eb169 ---- /dev/null -+++ b/gfxdrivers/davinci/davincifb.h -@@ -0,0 +1,581 @@ -+/* -+ * Copyright (C) 2006 Texas Instruments Inc -+ * -+ * 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. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * File: davincifb.h -+ */ -+ -+#ifndef DAVINVI_VPBE_H -+#define DAVINVI_VPBE_H -+ -+/* include Linux files */ -+#include <linux/fb.h> -+ -+/* define the custom FBIO_WAITFORVSYNC ioctl */ -+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) -+#define FBIO_SETATTRIBUTE _IOW('F', 0x21, struct fb_fillrect) -+ -+/* Backported IOCTLS. */ -+#define FBIO_SETPOSX _IOW('F', 0x22, u_int32_t) -+#define FBIO_SETPOSY _IOW('F', 0x23, u_int32_t) -+#define FBIO_SETZOOM _IOW('F', 0x24, struct zoom_params) -+#define FBIO_GETSTD _IOR('F', 0x25, u_int32_t) -+#define FBIO_RESIZER _IOW('F', 0x26, struct vpfe_resizer_params) -+#define FBIO_SYNC _IOW('F', 0x27, u_int32_t) -+ -+typedef struct zoom_params { -+ u_int32_t window_id; -+ u_int32_t zoom_h; -+ u_int32_t zoom_v; -+} zoom_params_t; -+ -+typedef struct vpfe_resizer_params -+{ -+ u_int32_t rsz_cnt; //busy-lock -+ u_int32_t out_size; //busy-lock -+ u_int32_t in_start; //busy-lock -+ u_int32_t in_size; //busy-lock -+ u_int32_t sdr_inadd; //shadowed -+ u_int32_t sdr_inoff; //shadowed -+ u_int32_t sdr_outadd; //shadowed -+ u_int32_t sdr_outoff; //shadowed -+ u_int32_t hfilt[16]; //busy-lock -+ u_int32_t vfilt[16]; //busy-lock -+ u_int32_t yenh; //busy-lock -+} vpfe_resizer_params_t; -+ -+typedef struct fb_set_start { -+ int offset; /* offset from smem_start */ -+ unsigned long physical; /* absolute physical address when offset < 0 */ -+ -+ u_int64_t sync; /* input: target sync counter for change or 0 for no sync at all, -+ output: sync counter of actual change or 0 if still pending */ -+} fb_set_start_t; -+ -+ -+#ifdef _IOC_TYPECHECK -+#undef _IOC_TYPECHECK -+#define _IOC_TYPECHECK(x) (sizeof(x)) -+#endif -+ -+#define RAM_CLUT_SIZE 256*3 -+#define FBIO_ENABLE_DISABLE_WIN \ -+ _IOW('F', 0x30, unsigned char) -+#define FBIO_SET_BITMAP_BLEND_FACTOR \ -+ _IOW('F', 0x31, vpbe_bitmap_blend_params_t) -+#define FBIO_SET_BITMAP_WIN_RAM_CLUT \ -+ _IOW('F', 0x32, unsigned char)*RAM_CLUT_SIZE) -+#define FBIO_ENABLE_DISABLE_ATTRIBUTE_WIN \ -+ _IOW('F', 0x33, unsigned int) -+#define FBIO_GET_BLINK_INTERVAL \ -+ _IOR('F', 0x34, vpbe_blink_option_t) -+#define FBIO_SET_BLINK_INTERVAL \ -+ _IOW('F', 0x35, vpbe_blink_option_t) -+#define FBIO_GET_VIDEO_CONFIG_PARAMS \ -+ _IOR('F', 0x36, vpbe_video_config_params_t) -+#define FBIO_SET_VIDEO_CONFIG_PARAMS \ -+ _IOW('F', 0x37, vpbe_video_config_params_t) -+#define FBIO_GET_BITMAP_CONFIG_PARAMS \ -+ _IOR('F', 0x38, vpbe_bitmap_config_params_t) -+#define FBIO_SET_BITMAP_CONFIG_PARAMS \ -+ _IOW('F', 0x39, vpbe_bitmap_config_params_t) -+#define FBIO_SET_DCLK \ -+ _IOW('F', 0x40, vpbe_dclk_t) -+#define FBIO_SET_INTERFACE \ -+ _IOW('F', 0x41, unsigned char) -+#define FBIO_GET_INTERFACE \ -+ _IOR('F', 0x42, unsigned char) -+#define FBIO_QUERY_TIMING \ -+ _IOWR('F', 0x43, struct vpbe_mode_info) -+#define FBIO_SET_TIMING \ -+ _IOW('F', 0x44, struct vpbe_fb_videomode) -+#define FBIO_GET_TIMING \ -+ _IOR('F', 0x45, struct vpbe_fb_videomode) -+#define FBIO_SET_VENC_CLK_SOURCE \ -+ _IOW('F', 0x46, unsigned char) -+#define FBIO_SET_BACKG_COLOR \ -+ _IOW('F', 0x47, vpbe_backg_color_t) -+#define FBIO_ENABLE_DISPLAY \ -+ _IOW('F', 0x48, unsigned char) -+#define FBIO_SETPOS \ -+ _IOW('F', 0x49, u_int32_t) -+#define FBIO_SET_CURSOR \ -+ _IOW('F', 0x50, struct fb_cursor) -+#define FBIO_SET_START \ -+ _IOW('F', 0x66, struct fb_set_start) -+ -+/* -+ * Defines and Constants -+ */ -+#ifdef __KERNEL__ -+#define DAVINCIFB_DEVICE "davincifb" -+#define DAVINCIFB_DRIVER "davincifb" -+ -+#define MULTIPLE_BUFFERING 1 -+ -+#ifdef MULTIPLE_BUFFERING -+#define DOUBLE_BUF 2 -+#define TRIPLE_BUF 3 -+#else -+#define DOUBLE_BUF 1 -+#define TRIPLE_BUF 1 -+#endif -+ -+/* usage: if (is_win(info->fix.id, OSD0)) ... */ -+#define is_win(name, x) ((strcmp(name, x ## _FBNAME) == 0) ? 1 : 0) -+ -+/* -+ * display controller register I/O routines -+ */ -+u32 dispc_reg_in(u32 offset); -+u32 dispc_reg_out(u32 offset, u32 val); -+u32 dispc_reg_merge(u32 offset, u32 val, u32 mask); -+ -+#endif /*__KERNEL__*/ -+ -+/* Error return codes */ -+#define VPBE_INVALID_PARA_VALUE 700 -+#define VPBE_WRONG_WINDOW_ID 701 -+#define VPBE_CURRENTLY_IN_REQUIRED_MODE 702 -+#define VPBE_INSUFFICIENT_CLUT_VALUES 703 -+#define VPBE_CLUT_WRITE_TIMEOUT 704 -+#define VPBE_VID0_BUF_ADR_NULL 705 -+#define VPBE_WINDOW_NOT_DISABLED 706 -+#define VPBE_WINDOW_NOT_ENABLED 707 -+ -+#ifndef __KERNEL__ -+/* Window ID definations */ -+#define OSD0 0 -+#define VID0 1 -+#define OSD1 2 -+#define VID1 3 -+#endif -+ -+/* There are 4 framebuffers, each represented by an fb_info and -+ * a dm_win_info structure */ -+#define OSD0_FBNAME "dm_osd0_fb" -+#define OSD1_FBNAME "dm_osd1_fb" -+#define VID0_FBNAME "dm_vid0_fb" -+#define VID1_FBNAME "dm_vid1_fb" -+ -+/* FIXME: Digital LCD RGB matrix coefficients */ -+#define DLCD_DGY_VAL 0 -+#define DLCD_DRV_VAL 0 -+#define DLCD_DGU_VAL 0 -+#define DLCD_DBU_VAL 0 -+ -+/* Defines for bitmap format */ -+#define VPBE_BITMAP_BIT_1 1 -+#define VPBE_BITMAP_BIT_2 2 -+#define VPBE_BITMAP_BIT_4 4 -+#define VPBE_BITMAP_BIT_8 8 -+#define VPBE_BITMAP_RGB565 16 -+#define VPBE_VIDEO_YUV422 16 -+#define VPBE_VIDEO_RGB888 24 -+ -+/* Defines foe cursor parameter validation*/ -+#define MAX_CURSOR_WIDTH 0x3FF -+#define MAX_CURSOR_HEIGHT 0x1FF -+#define MAX_CURSOR_LINEWIDTH 7 -+ -+#define BASEX 0x80 -+#define BASEY 0x12 -+#define BASEX_DLCD 0x59 -+#define BASEY_DLCD 0x22 -+ -+/* -+ * Enumerations -+ */ -+/* Enum for blending factor */ -+typedef enum vpbe_blend_factor { -+ OSD_CONTRIBUTION_ZERO = 0, -+ OSD_CONTRIBUTION_1_BY_8 = 1, -+ OSD_CONTRIBUTION_2_BY_8 = 2, -+ OSD_CONTRIBUTION_3_BY_8 = 3, -+ OSD_CONTRIBUTION_4_BY_8 = 4, -+ OSD_CONTRIBUTION_5_BY_8 = 5, -+ OSD_CONTRIBUTION_6_BY_8 = 6, -+ OSD_CONTRIBUTION_ONE = 7 -+} vpbe_blend_factor_t; -+ -+/* Enum for Boolean variables */ -+typedef enum { -+ SET_0 = 0, -+ SET_1 = 1 -+} CB_CR_ORDER, ATTRIBUTE, ROM_RAM_CLUT; -+ -+/* Defines for Display Interface */ -+#define PRGB 0 -+#define COMPOSITE 1 -+#define SVIDEO 2 -+#define COMPONENT 3 -+#define RGB 4 -+#define YCC16 5 -+#define YCC8 6 -+#define SRGB 7 -+#define EPSON 8 -+#define CASIO1G 9 -+#define UDISP 10 -+#define STN 11 -+#define VPBE_MAX_INTERFACES 12 -+ -+/* Defines for Display Mode */ -+#define LCD 0 -+#define NTSC 1 -+#define PAL 2 -+#define P525 3 -+#define P625 4 -+ -+#define DEFAULT_MODE 0 -+#define P480 0 -+#define P400 1 -+#define P350 2 -+#define NON_EXISTING_MODE 255 -+/* Enable/Disable enum */ -+typedef enum { -+ VPBE_DISABLE = 0, -+ VPBE_ENABLE = 1 -+} ATTENUATION, TRANSPARENCY, EXPANSION, BLINKING; -+ -+typedef enum clk_source { -+ CLK_SOURCE_CLK27 = 0, -+ CLK_SOURCE_CLK54 = 1, -+ CLK_SOURCE_VPBECLK = 2 -+} CLK_SOURCE; -+ -+/* -+ * Structures and Union Definitions -+ */ -+ -+/* Structure for transparency and the blending factor for the bitmap window */ -+typedef struct vpbe_bitmap_blend_params { -+ unsigned int colorkey; /* color key to be blend */ -+ unsigned int enable_colorkeying; /* enable color keying */ -+ unsigned int bf; /* valid range from 0 to 7 only. */ -+} vpbe_bitmap_blend_params_t; -+ -+/* Structure for window expansion */ -+typedef struct vpbe_win_expansion { -+ EXPANSION horizontal; -+ EXPANSION vertical; /* 1: Enable 0:disable */ -+} vpbe_win_expansion_t; -+ -+/* Structure for OSD window blinking options */ -+typedef struct vpbe_blink_option { -+ BLINKING blinking; /* 1: Enable blinking 0: Disable */ -+ unsigned int interval; /* Valid only if blinking is 1 */ -+} vpbe_blink_option_t; -+ -+/* Structure for DCLK parameters */ -+typedef struct vpbe_dclk { -+ unsigned char dclk_pattern_width; -+ unsigned int dclk_pattern0; -+ unsigned int dclk_pattern1; -+ unsigned int dclk_pattern2; -+ unsigned int dclk_pattern3; -+} vpbe_dclk_t; -+ -+/* Structure for display format */ -+typedef struct vpbe_display_format { -+ unsigned char interface; /* Output interface type */ -+ unsigned char mode; /* output mode */ -+} vpbe_display_format_t; -+ -+/* Structure for background color */ -+typedef struct vpbe_backg_color { -+ unsigned char clut_select; /* 2: RAM CLUT 1:ROM1 CLUT 0:ROM0 CLUT */ -+ unsigned char color_offset; /* index of color */ -+} vpbe_backg_color_t; -+ -+/* Structure for Video window configurable parameters */ -+typedef struct vpbe_video_config_params { -+ CB_CR_ORDER cb_cr_order; /*Cb/Cr order in input data for a pixel. */ -+ /* 0: cb cr 1: cr cb */ -+ vpbe_win_expansion_t exp_info; /* HZ/VT Expansion enable disable */ -+} vpbe_video_config_params_t; -+ -+/*Union of structures giving the CLUT index for the 1, 2, 4 bit bitmap values.*/ -+typedef union vpbe_clut_idx { -+ struct _for_4bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char bitmap_val_1; -+ unsigned char bitmap_val_2; -+ unsigned char bitmap_val_3; -+ unsigned char bitmap_val_4; -+ unsigned char bitmap_val_5; -+ unsigned char bitmap_val_6; -+ unsigned char bitmap_val_7; -+ unsigned char bitmap_val_8; -+ unsigned char bitmap_val_9; -+ unsigned char bitmap_val_10; -+ unsigned char bitmap_val_11; -+ unsigned char bitmap_val_12; -+ unsigned char bitmap_val_13; -+ unsigned char bitmap_val_14; -+ unsigned char bitmap_val_15; -+ } for_4bit_bimap; -+ struct _for_2bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char dummy0[4]; -+ unsigned char bitmap_val_1; -+ unsigned char dummy1[4]; -+ unsigned char bitmap_val_2; -+ unsigned char dummy2[4]; -+ unsigned char bitmap_val_3; -+ } for_2bit_bimap; -+ struct _for_1bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char dummy0[14]; -+ unsigned char bitmap_val_1; -+ } for_1bit_bimap; -+} vpbe_clut_idx_t; -+ -+/* Structure for bitmap window configurable parameters */ -+typedef struct vpbe_bitmap_config_params { -+ /* Only for bitmap width = 1,2,4 bits */ -+ vpbe_clut_idx_t clut_idx; -+ /* Attenuation value for YUV o/p for bitmap window */ -+ unsigned char attenuation_enable; -+ /* 0: ROM DM270, 1:ROM DM320, 2:RAM CLUT */ -+ unsigned char clut_select; -+} vpbe_bitmap_config_params_t; -+ -+/* Unioun for video/OSD configuration parameters */ -+typedef union vpbe_conf_params { -+ -+ struct vpbe_video_params { -+ CB_CR_ORDER cb_cr_order; -+ /* HZ/VT Expansion enable disable */ -+ vpbe_win_expansion_t exp_info; -+ } video_params; -+ -+ struct vpbe_bitmap_params { -+ /* Attenuation value for YUV o/p */ -+ ATTENUATION attenuation_enable; -+ /* 0: ROM DM270, 1: ROM DM320, 2:RAM CLUT */ -+ unsigned char clut_select; -+ /* Only for bitmap width = 1,2,4 bits */ -+ vpbe_clut_idx_t clut_idx; -+ /* 0: OSD window is bitmap window */ -+ /* 1: OSD window is attribute window */ -+ ATTRIBUTE enable_attribute; -+ /* To hold bps value. -+ Used to switch back from attribute to bitmap. */ -+ unsigned int stored_bits_per_pixel; -+ /* Blending information */ -+ vpbe_bitmap_blend_params_t blend_info; -+ /* OSD Blinking information */ -+ vpbe_blink_option_t blink_info; -+ } bitmap_params; -+ -+} vpbe_conf_params_t; -+ -+typedef struct vpbe_video_params vpbe_video_params_t; -+typedef struct vpbe_bitmap_params vpbe_bitmap_params_t; -+ -+/* Structure to hold window position */ -+typedef struct vpbe_window_position { -+ unsigned int xpos; /* X position of the window */ -+ unsigned int ypos; /* Y position of the window */ -+} vpbe_window_position_t; -+ -+#ifdef __KERNEL__ -+/* Structure for each window */ -+typedef struct vpbe_dm_win_info { -+ struct fb_info info; -+ vpbe_window_position_t win_pos; /* X,Y position of window */ -+ /* Size of window is already there in var_info structure. */ -+ -+ dma_addr_t fb_base_phys; /*framebuffer area */ -+ unsigned int fb_base; /*window memory pointer */ -+ unsigned int fb_size; /*memory size */ -+ unsigned int pseudo_palette[17]; -+ int alloc_fb_mem; -+ /*flag to identify if framebuffer area is fixed or not */ -+ unsigned long sdram_address; -+ struct vpbe_dm_info *dm; -+ unsigned char window_enable; /*Additions for all windows */ -+ zoom_params_t zoom; /*Zooming parameters */ -+ unsigned char field_frame_select; /*To select Field or frame */ -+ unsigned char numbufs; /*Number of buffers valid 2 or 3 */ -+ vpbe_conf_params_t conf_params; -+ /*window configuration parameter union pointer */ -+} vpbe_dm_win_info_t; -+#endif /*__KERNEL__*/ -+ -+/* -+ * Videmode structure for display interface and mode settings -+ */ -+typedef struct vpbe_fb_videomode { -+ unsigned char name[10]; /* Mode name ( NTSC , PAL) */ -+ unsigned int vmode; /* FB_MODE_INTERLACED or FB_MODE_NON_INTERLACED */ -+ unsigned int xres; /* X Resolution of the display */ -+ unsigned int yres; /* Y Resolution of the display */ -+ unsigned int fps; /* frames per second */ -+ /* Timing Parameters applicable for std = 0 only */ -+ unsigned int left_margin; -+ unsigned int right_margin; -+ unsigned int upper_margin; -+ unsigned int lower_margin; -+ unsigned int hsync_len; -+ unsigned int vsync_len; -+ unsigned int sync; /* 0: hsync -ve/vsync -ve */ -+ /*1: hsync -ve/vsync +ve */ -+ /*2: hsync +ve/vsync -ve */ -+ /*3: hsync +ve/vsync +ve */ -+ unsigned int basepx; /* Display x,y start position */ -+ unsigned int basepy; -+/* 1= Mode s available in modelist 0=Mode is not available in modelist */ -+ unsigned int std; -+} vpbe_fb_videomode_t; -+ -+/* Structure to interface videomode to application*/ -+typedef struct vpbe_mode_info { -+ vpbe_fb_videomode_t vid_mode; -+ unsigned char interface; -+ unsigned char mode_idx; -+} vpbe_mode_info_t; -+ -+#ifdef __KERNEL__ -+/* -+ * Structure for the driver holding information of windows, -+ * memory base addresses etc. -+ */ -+typedef struct vpbe_dm_info { -+ vpbe_dm_win_info_t *osd0; -+ vpbe_dm_win_info_t *osd1; -+ vpbe_dm_win_info_t *vid0; -+ vpbe_dm_win_info_t *vid1; -+ -+/* to map the registers */ -+ dma_addr_t mmio_base_phys; -+ unsigned int mmio_base; -+ unsigned int mmio_size; -+ -+ wait_queue_head_t vsync_wait; -+ unsigned int vsync_cnt; -+ int timeout; -+ -+ /* this is the function that configures the output device (NTSC/PAL/LCD) -+ * for the required output format (composite/s-video/component/rgb) -+ */ -+ void (*output_device_config) (void); -+ -+ struct device *dev; -+ -+ vpbe_backg_color_t backg; /* background color */ -+ vpbe_dclk_t dclk; /*DCLK parameters */ -+ vpbe_display_format_t display; /*Display interface and mode */ -+ vpbe_fb_videomode_t videomode; /*Cuurent videomode */ -+ char ram_clut[256][3]; /*RAM CLUT array */ -+ struct fb_cursor cursor; /* cursor config params from fb.h */ -+/*Flag that indicates whether any of the display is enabled or not*/ -+ int display_enable; -+} vpbe_dm_info_t; -+ -+/* -+ * Functions Definitions for 'davincifb' module -+ */ -+int vpbe_mem_alloc_window_buf(vpbe_dm_win_info_t *); -+int vpbe_mem_release_window_buf(vpbe_dm_win_info_t *); -+void init_display_function(vpbe_display_format_t *); -+int vpbe_mem_alloc_struct(vpbe_dm_win_info_t **); -+void set_vid0_default_conf(void); -+void set_vid1_default_conf(void); -+void set_osd0_default_conf(void); -+void set_osd1_default_conf(void); -+void set_cursor_default_conf(void); -+void set_dm_default_conf(void); -+void set_win_enable(char *, unsigned int); -+int within_vid0_limits(u32, u32, u32, u32); -+void vpbe_set_display_default(void); -+#ifdef __KERNEL__ -+void set_win_position(char *, u32, u32, u32, u32); -+void change_win_param(int); -+void set_interlaced(char *, unsigned int); -+#endif /* __KERNEL__ */ -+ -+/* -+ * Function definations for 'osd' module -+ */ -+ -+int vpbe_enable_window(vpbe_dm_win_info_t *); -+int vpbe_disable_window(vpbe_dm_win_info_t *); -+int vpbe_vid_osd_select_field_frame(u8 *, u8); -+int vpbe_bitmap_set_blend_factor(u8 *, vpbe_bitmap_blend_params_t *); -+int vpbe_bitmap_set_ram_clut(void); -+int vpbe_enable_disable_attribute_window(u32); -+int vpbe_get_blinking(u8 *, vpbe_blink_option_t *); -+int vpbe_set_blinking(u8 *, vpbe_blink_option_t *); -+int vpbe_set_vid_params(u8 *, vpbe_video_config_params_t *); -+int vpbe_get_vid_params(u8 *, vpbe_video_config_params_t *); -+int vpbe_bitmap_get_params(u8 *, vpbe_bitmap_config_params_t *); -+int vpbe_bitmap_set_params(u8 *, vpbe_bitmap_config_params_t *); -+int vpbe_set_cursor_params(struct fb_cursor *); -+int vpbe_set_vid_expansion(vpbe_win_expansion_t *); -+int vpbe_set_dclk(vpbe_dclk_t *); -+int vpbe_set_display_format(vpbe_display_format_t *); -+int vpbe_set_backg_color(vpbe_backg_color_t *); -+int vpbe_set_interface(u8); -+int vpbe_query_mode(vpbe_mode_info_t *); -+int vpbe_set_mode(struct vpbe_fb_videomode *); -+int vpbe_set_venc_clk_source(u8); -+void set_vid0_default_conf(void); -+void set_osd0_default_conf(void); -+void set_vid1_default_conf(void); -+void set_osd1_default_conf(void); -+void set_cursor_default_conf(void); -+void set_dm_default_conf(void); -+/* -+ * Function definations for 'venc' module -+ */ -+ -+void davincifb_ntsc_composite_config(void); -+void davincifb_ntsc_svideo_config(void); -+void davincifb_ntsc_component_config(void); -+void davincifb_pal_composite_config(void); -+void davincifb_pal_svideo_config(void); -+void davincifb_pal_component_config(void); -+ -+void vpbe_davincifb_ntsc_rgb_config(void); -+void vpbe_davincifb_pal_rgb_config(void); -+void vpbe_davincifb_525p_component_config(void); -+void vpbe_davincifb_625p_component_config(void); -+ -+void vpbe_enable_venc(int); -+void vpbe_enable_dacs(int); -+/* -+ * Function definations for 'dlcd' module -+ */ -+void vpbe_davincifb_480p_prgb_config(void); -+void vpbe_davincifb_400p_prgb_config(void); -+void vpbe_davincifb_350p_prgb_config(void); -+void vpbe_set_display_timing(struct vpbe_fb_videomode *); -+ -+void vpbe_enable_lcd(int); -+/* -+ * Following functions are not implemented -+ */ -+void vpbe_davincifb_default_ycc16_config(void); -+void vpbe_davincifb_default_ycc8_config(void); -+void vpbe_davincifb_default_srgb_config(void); -+void vpbe_davincifb_default_epson_config(void); -+void vpbe_davincifb_default_casio_config(void); -+void vpbe_davincifb_default_UDISP_config(void); -+void vpbe_davincifb_default_STN_config(void); -+#endif /*__KERNEL__*/ -+ -+#endif /* End of #ifndef DAVINCI_VPBE_H */ diff --git a/src/patches/DirectFB-1.7.7-fix_mknod.patch b/src/patches/DirectFB-1.7.7-fix_mknod.patch deleted file mode 100644 index 12ac2cac5..000000000 --- a/src/patches/DirectFB-1.7.7-fix_mknod.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Debian Multimedia Maintainers - <pkg-multimedia-maintainers(a)lists.alioth.debian.org> -Date: Thu, 16 Mar 2017 20:48:20 +0100 -Subject: _fix_mknod - ---- - gfxdrivers/davinci/davinci_c64x.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gfxdrivers/davinci/davinci_c64x.c b/gfxdrivers/davinci/davinci_c64x.c -index 431ffdd..420b567 100644 ---- a/gfxdrivers/davinci/davinci_c64x.c -+++ b/gfxdrivers/davinci/davinci_c64x.c -@@ -37,6 +37,8 @@ - #include <sys/ioctl.h> - #include <sys/mman.h> - #include <sys/types.h> -+#include <sys/stat.h> -+#include <sys/sysmacros.h> - #include <unistd.h> - - #include <directfb_util.h> diff --git a/src/patches/bitstream-makefile.patch b/src/patches/bitstream-makefile.patch deleted file mode 100644 index 35aeac8d9..000000000 --- a/src/patches/bitstream-makefile.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- Makefile.org 2013-06-14 12:59:46.000000000 +0200 -+++ Makefile 2013-06-14 13:00:01.000000000 +0200 -@@ -1,4 +1,4 @@ --PREFIX ?= /usr/local -+PREFIX ?= /usr - INCLUDE = $(subst //,/,$(DESTDIR)/$(PREFIX)/include/bitstream) - VERSION = 1.0 diff --git a/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch b/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch deleted file mode 100644 index 0fbc07a50..000000000 --- a/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ez-ipupdate.c b/ez-ipupdate.c -index 9aea495..a6d2528 100644 ---- a/ez-ipupdate.c -+++ b/ez-ipupdate.c -@@ -95,7 +95,7 @@ - #define HN_DEFAULT_PORT "80" - #define HN_REQUEST "/vanity/update" - --#define ZONEEDIT_DEFAULT_SERVER "www.zoneedit.com" -+#define ZONEEDIT_DEFAULT_SERVER "dynamic.zoneedit.com" - #define ZONEEDIT_DEFAULT_PORT "80" - #define ZONEEDIT_REQUEST "/auth/dynamic.html" - diff --git a/src/patches/ez-ipupdate.formstring.patch b/src/patches/ez-ipupdate.formstring.patch deleted file mode 100644 index 83187d197..000000000 --- a/src/patches/ez-ipupdate.formstring.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ez-ipupdate.c.old 2002-03-12 00:31:47.000000000 +0100 -+++ ez-ipupdate.c 2004-11-10 15:28:23.000000000 +0100 -@@ -798,7 +798,7 @@ void show_message(char *fmt, ...) - sprintf(buf, "message incomplete because your OS sucks: %s\n", fmt); - #endif - -- syslog(LOG_NOTICE, buf); -+ syslog(LOG_NOTICE, "%s", buf); - } - else - { diff --git a/src/patches/multicat-makefile.patch b/src/patches/multicat-makefile.patch deleted file mode 100644 index 60a987bbe..000000000 --- a/src/patches/multicat-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- Makefile.orig 2013-06-14 12:39:11.000000000 +0200 -+++ Makefile 2013-06-14 12:39:20.000000000 +0200 -@@ -13,7 +13,7 @@ - OBJ_LASTS = lasts.o - OBJ_MULTICAT_VALIDATE = multicat_validate.o util.o - --PREFIX ?= /usr/local -+PREFIX ?= /usr - BIN = $(DESTDIR)/$(PREFIX)/bin - MAN = $(DESTDIR)/$(PREFIX)/share/man/man1 - - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 09b09b859df6ee460acb28a0c7d5d6a0dfa42a60
by Arne Fitzenreiter 15 Feb '20

15 Feb '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 09b09b859df6ee460acb28a0c7d5d6a0dfa42a60 (commit) from 900652ec6ce9d8d2e58225fa8abbfddbfdcbc05f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 09b09b859df6ee460acb28a0c7d5d6a0dfa42a60 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Feb 15 16:21:04 2020 +0100 make.sh: Build lua before haproxy. In commit b6ab15eaa2a899944c7edca99769fa4469f215d3 lua support for haproxy has been enabled, so lua now has to be compiled before haproxy. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Acked-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/make.sh b/make.sh index 277ac8633..c0137ecc0 100755 --- a/make.sh +++ b/make.sh @@ -1618,9 +1618,9 @@ buildipfire() { lfsmake2 pigz lfsmake2 tmux lfsmake2 perl-Text-CSV_XS + lfsmake2 lua lfsmake2 haproxy lfsmake2 ipset - lfsmake2 lua lfsmake2 dnsdist lfsmake2 bird lfsmake2 frr hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2020