[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 54d5414848653dcafb857d91adeb7f4ae9b1a1d9
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 54d5414848653dcafb857d91adeb7f4ae9b1a1d9 (commit) via d8ac9a162cfad8c440fdd49fdecdf26f0fab9b20 (commit) via 2dd9f3b3798dcbae89c1bc906050d443e50729fa (commit) via d32233aa1bc9f97b73f7993d2e5dce25e382e04c (commit) via 71196131be7f7d6933e6da77199c562b195e8f05 (commit) via 71cf8c8a6f1aa76e260180fabb6e0eafbb3650a7 (commit) via 2d5940daca7ccdf94796979a247d645a14191a11 (commit) via c4713705d1e540fc5f977d33cb9aa14b875a930f (commit) via 4fcf8acfeab3ee21b16fe0bac595e1cf079ead83 (commit) via db116a33d60f9bea34b3fda98603fe2ae195f514 (commit) via abf2b05474f7024cc69efcf70df01f5ad19b6816 (commit) via 3e8ce0dd86ca945249f51657eb39ef0f0465fb7b (commit) via e3e17107ba76e7e787bd86bf058c8ac06ea26054 (commit) via a350ea6deacaf9755c8e127285ceac3dfa4ca42b (commit) via 922ec43f997e84d54c593b4a059c3c64ccd00383 (commit) via 690a8b9d8908f44ddef9d9a60b8211fcf73fa8d6 (commit) via 0d29afc2c1258dc0bba00ad0e63fd5c9e17c5ee8 (commit) via 338087530c10ee9599b8421a66ebf7773755aa5a (commit) via 77930de8349559b4e35670a6659f24117e89e229 (commit) from ea6dd5b0aca7b28d7b9a5b539f614fcf6b736b18 (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 54d5414848653dcafb857d91adeb7f4ae9b1a1d9 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 14:24:12 2018 +0000
toolchain: Add zlib
ccache needs this and usually comes with an own bundled version but fails to build in version 3.4.1.
Since this is a small library only and we really want ccache to use compression, we will build this indepently and let ccache use it from the system.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d8ac9a162cfad8c440fdd49fdecdf26f0fab9b20 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 13:07:38 2018 +0000
Bump toolchain version
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2dd9f3b3798dcbae89c1bc906050d443e50729fa Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 12:44:37 2018 +0000
Cleanup toolchain scripts
No functional changes, just some tidy up
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d32233aa1bc9f97b73f7993d2e5dce25e382e04c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 12:12:08 2018 +0000
ccache: Update to 3.4.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 71196131be7f7d6933e6da77199c562b195e8f05 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 12:09:22 2018 +0000
PAM: Drop shipped configuration
This is outdated, broken and has hardcoded passwords.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 71cf8c8a6f1aa76e260180fabb6e0eafbb3650a7 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 12:07:29 2018 +0000
Drop perl-DBD-mysql
This package is not used by anything and depends on MySQL which has been dropped, too.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2d5940daca7ccdf94796979a247d645a14191a11 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 12:05:46 2018 +0000
Drop MySQL
This is outdated and still on 5.0.x and nobody volunteered to update this package.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c4713705d1e540fc5f977d33cb9aa14b875a930f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:55:28 2018 +0000
asterisk: Do not depend on MySQL any more
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4fcf8acfeab3ee21b16fe0bac595e1cf079ead83 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:52:07 2018 +0000
postfix: Don't depend on amavis
This can be used together but there is no need to always install amavis when someone wants to use postfix
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit db116a33d60f9bea34b3fda98603fe2ae195f514 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:51:46 2018 +0000
postfix: Don't depend on MySQL any more
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit abf2b05474f7024cc69efcf70df01f5ad19b6816 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:50:51 2018 +0000
postfix: Don't ship our own configuration
This is outdated and half of it is not maintained any more.
Users should configure postfix themselves based on the default configuration.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3e8ce0dd86ca945249f51657eb39ef0f0465fb7b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:44:28 2018 +0000
Drop pammysql
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e3e17107ba76e7e787bd86bf058c8ac06ea26054 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:42:47 2018 +0000
Drop tcpwrapper
This library has been unused for quite a while
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a350ea6deacaf9755c8e127285ceac3dfa4ca42b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:40:07 2018 +0000
Drop mISDN userspace tools
This is unsupported for quite a while and nobody should be using this.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 922ec43f997e84d54c593b4a059c3c64ccd00383 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:33:51 2018 +0000
Drop capi4k-utils
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 690a8b9d8908f44ddef9d9a60b8211fcf73fa8d6 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:31:14 2018 +0000
core119: Remove dropped lcr package during update
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0d29afc2c1258dc0bba00ad0e63fd5c9e17c5ee8 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:29:53 2018 +0000
core119: Import changed packages
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 338087530c10ee9599b8421a66ebf7773755aa5a Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:22:58 2018 +0000
Start Core Update 119
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 77930de8349559b4e35670a6659f24117e89e229 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 12 11:18:01 2018 +0000
Rootfile update for bison
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/includes/mysql | 2 - config/collectd/collectd.conf | 1 - config/etc/group | 1 - config/etc/passwd | 1 - config/mysql/my.cnf | 23 -- config/pam/ftp | 2 - config/pam/imap | 2 - config/pam/other | 5 - config/pam/pop | 2 - config/pam/sieve | 2 - config/pam/smtp | 2 - config/postfix/aliases | 6 - config/postfix/body_checks | 1 - config/postfix/header_checks | 379 --------------------- config/postfix/main.cf | 83 ----- config/postfix/master.cf | 103 ------ config/postfix/mysql-canonical.cf | 8 - config/postfix/mysql-mydestination.cf | 7 - config/postfix/mysql-virtual.cf | 8 - config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/bison | 115 +++++-- config/rootfiles/common/capi4k-utils | 12 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/common/mISDNuser | 26 -- config/rootfiles/common/mysql-libs | 10 - config/rootfiles/common/pam | 6 - config/rootfiles/common/pammysql | 2 - config/rootfiles/common/tcpwrapper | 21 -- config/rootfiles/common/x86_64/initscripts | 1 - config/rootfiles/core/{118 => 119}/exclude | 0 .../100 => core/119}/filelists/armv5tel/binutils | 0 .../100 => core/119}/filelists/armv5tel/gcc | 0 .../100 => core/119}/filelists/armv5tel/glibc | 0 .../{oldcore/101 => core/119}/filelists/dma | 0 .../{oldcore/58 => core/119}/filelists/files | 4 +- .../{oldcore/79 => core/119}/filelists/hostname | 0 .../100 => core/119}/filelists/i586/binutils | 0 .../{oldcore/100 => core/119}/filelists/i586/gcc | 0 .../{oldcore/100 => core/119}/filelists/i586/glibc | 0 .../{oldcore/106 => core/119}/filelists/iproute2 | 0 .../{oldcore/61 => core/119}/filelists/pam | 0 .../{oldcore/66 => core/119}/filelists/setup | 0 .../100 => core/119}/filelists/x86_64/binutils | 0 .../{oldcore/100 => core/119}/filelists/x86_64/gcc | 0 .../100 => core/119}/filelists/x86_64/glibc | 0 config/rootfiles/core/{118 => 119}/meta | 0 config/rootfiles/core/{118 => 119}/update.sh | 41 ++- config/rootfiles/{core => oldcore}/118/exclude | 0 .../rootfiles/{core => oldcore}/118/filelists/bind | 0 .../{core => oldcore}/118/filelists/files | 0 .../rootfiles/{core => oldcore}/118/filelists/glib | 0 .../rootfiles/{core => oldcore}/118/filelists/gzip | 0 .../{core => oldcore}/118/filelists/hdparm | 0 .../{core => oldcore}/118/filelists/i586/dmidecode | 0 .../rootfiles/{core => oldcore}/118/filelists/lz4 | 0 .../{core => oldcore}/118/filelists/openssh | 0 .../{core => oldcore}/118/filelists/poppler | 0 .../rootfiles/{core => oldcore}/118/filelists/sed | 0 .../{core => oldcore}/118/filelists/snort | 0 .../{core => oldcore}/118/filelists/squid | 0 .../{core => oldcore}/118/filelists/unbound | 0 .../rootfiles/{core => oldcore}/118/filelists/wget | 0 .../118/filelists/x86_64/dmidecode | 0 config/rootfiles/{core => oldcore}/118/meta | 0 config/rootfiles/{core => oldcore}/118/update.sh | 0 config/rootfiles/packages/asterisk | 6 - config/rootfiles/packages/mysql | 302 ---------------- config/rootfiles/packages/perl-DBD-mysql | 14 - config/rootfiles/packages/postfix | 4 - lfs/asterisk | 5 +- lfs/automake | 7 +- lfs/bash | 8 +- lfs/bison | 4 +- lfs/capi4k-utils | 89 ----- lfs/ccache | 4 +- lfs/coreutils | 3 +- lfs/diffutils | 12 +- lfs/findutils | 8 +- lfs/flex | 13 +- lfs/gettext | 8 +- lfs/grep | 1 - lfs/m4 | 8 +- lfs/mISDNuser | 79 ----- lfs/make | 12 +- lfs/mysql | 110 ------ lfs/ncurses | 2 - lfs/pam | 1 - lfs/pammysql | 77 ----- lfs/patch | 12 +- lfs/perl-DBD-mysql | 84 ----- lfs/pkg-config | 11 +- lfs/postfix | 10 +- lfs/tar | 8 +- lfs/tcl | 6 +- lfs/tcpwrapper | 79 ----- lfs/texinfo | 4 +- lfs/xz | 2 - lfs/zlib | 4 +- make.sh | 11 +- src/initscripts/packages/mysql | 78 ----- src/initscripts/system/cleanfs | 4 - src/initscripts/system/mISDN | 68 ---- src/paks/mysql/install.sh | 50 --- src/paks/mysql/uninstall.sh | 35 -- src/paks/mysql/update.sh | 50 --- src/setup/main.c | 17 +- src/setup/misc.c | 10 - src/setup/setup.h | 1 - 108 files changed, 167 insertions(+), 2032 deletions(-) delete mode 100644 config/backup/includes/mysql delete mode 100644 config/mysql/my.cnf delete mode 100644 config/pam/ftp delete mode 100644 config/pam/imap delete mode 100644 config/pam/other delete mode 100644 config/pam/pop delete mode 100644 config/pam/sieve delete mode 100644 config/pam/smtp delete mode 100644 config/postfix/aliases delete mode 100644 config/postfix/body_checks delete mode 100644 config/postfix/header_checks delete mode 100644 config/postfix/main.cf delete mode 100644 config/postfix/master.cf delete mode 100644 config/postfix/mysql-canonical.cf delete mode 100644 config/postfix/mysql-mydestination.cf delete mode 100644 config/postfix/mysql-virtual.cf delete mode 100644 config/rootfiles/common/capi4k-utils delete mode 100644 config/rootfiles/common/mISDNuser delete mode 100644 config/rootfiles/common/mysql-libs delete mode 100644 config/rootfiles/common/pammysql delete mode 100644 config/rootfiles/common/tcpwrapper copy config/rootfiles/core/{118 => 119}/exclude (100%) copy config/rootfiles/{oldcore/100 => core/119}/filelists/armv5tel/binutils (100%) copy config/rootfiles/{oldcore/100 => core/119}/filelists/armv5tel/gcc (100%) copy config/rootfiles/{oldcore/100 => core/119}/filelists/armv5tel/glibc (100%) copy config/rootfiles/{oldcore/101 => core/119}/filelists/dma (100%) copy config/rootfiles/{oldcore/58 => core/119}/filelists/files (70%) copy config/rootfiles/{oldcore/79 => core/119}/filelists/hostname (100%) copy config/rootfiles/{oldcore/100 => core/119}/filelists/i586/binutils (100%) copy config/rootfiles/{oldcore/100 => core/119}/filelists/i586/gcc (100%) copy config/rootfiles/{oldcore/100 => core/119}/filelists/i586/glibc (100%) copy config/rootfiles/{oldcore/106 => core/119}/filelists/iproute2 (100%) copy config/rootfiles/{oldcore/61 => core/119}/filelists/pam (100%) copy config/rootfiles/{oldcore/66 => core/119}/filelists/setup (100%) copy config/rootfiles/{oldcore/100 => core/119}/filelists/x86_64/binutils (100%) copy config/rootfiles/{oldcore/100 => core/119}/filelists/x86_64/gcc (100%) copy config/rootfiles/{oldcore/100 => core/119}/filelists/x86_64/glibc (100%) copy config/rootfiles/core/{118 => 119}/meta (100%) copy config/rootfiles/core/{118 => 119}/update.sh (82%) rename config/rootfiles/{core => oldcore}/118/exclude (100%) rename config/rootfiles/{core => oldcore}/118/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/118/filelists/files (100%) rename config/rootfiles/{core => oldcore}/118/filelists/glib (100%) rename config/rootfiles/{core => oldcore}/118/filelists/gzip (100%) rename config/rootfiles/{core => oldcore}/118/filelists/hdparm (100%) rename config/rootfiles/{core => oldcore}/118/filelists/i586/dmidecode (100%) rename config/rootfiles/{core => oldcore}/118/filelists/lz4 (100%) rename config/rootfiles/{core => oldcore}/118/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/118/filelists/poppler (100%) rename config/rootfiles/{core => oldcore}/118/filelists/sed (100%) rename config/rootfiles/{core => oldcore}/118/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/118/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/118/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/118/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/118/filelists/x86_64/dmidecode (100%) rename config/rootfiles/{core => oldcore}/118/meta (100%) rename config/rootfiles/{core => oldcore}/118/update.sh (100%) delete mode 100644 config/rootfiles/packages/mysql delete mode 100644 config/rootfiles/packages/perl-DBD-mysql delete mode 100644 lfs/capi4k-utils delete mode 100644 lfs/mISDNuser delete mode 100644 lfs/mysql delete mode 100644 lfs/pammysql delete mode 100644 lfs/perl-DBD-mysql delete mode 100644 lfs/tcpwrapper delete mode 100644 src/initscripts/packages/mysql delete mode 100644 src/initscripts/system/mISDN delete mode 100644 src/paks/mysql/install.sh delete mode 100644 src/paks/mysql/uninstall.sh delete mode 100644 src/paks/mysql/update.sh
Difference in files: diff --git a/config/backup/includes/mysql b/config/backup/includes/mysql deleted file mode 100644 index bcb837c71..000000000 --- a/config/backup/includes/mysql +++ /dev/null @@ -1,2 +0,0 @@ -/etc/my.cnf -/srv/mysql diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index 486077a9e..aea72fc3f 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -78,7 +78,6 @@ include "/etc/collectd.precache" Process "mpd" Process "asterisk" Process "java" - Process "mysqld" Process "spamd" </Plugin>
diff --git a/config/etc/group b/config/etc/group index 03f5dce0b..198b68aa3 100644 --- a/config/etc/group +++ b/config/etc/group @@ -17,7 +17,6 @@ utmp:x:22: squid:x:23:nobody ntp:x:38: dip:x:40: -mysql:x:41: ftp:x:45: rsyncd:x:48: stunnel:x:51: diff --git a/config/etc/passwd b/config/etc/passwd index 247faa2a1..7eb4718f1 100644 --- a/config/etc/passwd +++ b/config/etc/passwd @@ -4,7 +4,6 @@ daemon:x:2:2:daemon:/sbin:/bin/false mail:x:8:12:mail:/var/spool/mail:/bin/false squid:x:23:23:ftp:/var/spool/squid:/bin/false ntp:x:38:38::/etc/ntp:/bin/false -mysql:x:41:41:MySQL Server:/dev/null:/bin/false ftp:x:45:45:anonymous_user:/home/ftp:/bin/false rsyncd:x:48:48:rsyncd Daemon:/home/rsync:/bin/false stunnel:x:51:51:stunnel Daemon:/var/lib/stunnel:/bin/false diff --git a/config/mysql/my.cnf b/config/mysql/my.cnf deleted file mode 100644 index d9b75e8c0..000000000 --- a/config/mysql/my.cnf +++ /dev/null @@ -1,23 +0,0 @@ -[client] -password = mysqlfire -port = 3306 -socket = /var/run/mysql/mysql.sock - -[mysqld] -port = 3306 -socket = /var/run/mysql/mysql.sock -datadir = /srv/mysql -bind-address=127.0.0.1 - -[mysql.server] -user=mysql -basedir=/var/lib - -[mysqld_safe] -log-error=/var/log/mysqld.log -#pid-file=/var/run/mysqld/mysqld.pid - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates diff --git a/config/pam/ftp b/config/pam/ftp deleted file mode 100644 index 3475b4822..000000000 --- a/config/pam/ftp +++ /dev/null @@ -1,2 +0,0 @@ -auth required pam_unix.so nullok shadow -account required pam_unix.so diff --git a/config/pam/imap b/config/pam/imap deleted file mode 100644 index f8f411f3d..000000000 --- a/config/pam/imap +++ /dev/null @@ -1,2 +0,0 @@ -auth sufficient pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0 -account required pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0 diff --git a/config/pam/other b/config/pam/other deleted file mode 100644 index c286c823c..000000000 --- a/config/pam/other +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth required pam_deny.so -account required pam_deny.so -password required pam_deny.so -session required pam_deny.so diff --git a/config/pam/pop b/config/pam/pop deleted file mode 100644 index f8f411f3d..000000000 --- a/config/pam/pop +++ /dev/null @@ -1,2 +0,0 @@ -auth sufficient pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0 -account required pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0 diff --git a/config/pam/sieve b/config/pam/sieve deleted file mode 100644 index f8f411f3d..000000000 --- a/config/pam/sieve +++ /dev/null @@ -1,2 +0,0 @@ -auth sufficient pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0 -account required pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0 diff --git a/config/pam/smtp b/config/pam/smtp deleted file mode 100644 index f8f411f3d..000000000 --- a/config/pam/smtp +++ /dev/null @@ -1,2 +0,0 @@ -auth sufficient pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0 -account required pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0 diff --git a/config/postfix/aliases b/config/postfix/aliases deleted file mode 100644 index fbe7299cf..000000000 --- a/config/postfix/aliases +++ /dev/null @@ -1,6 +0,0 @@ -# Begin /etc/aliases - -MAILER-DAEMON: postmaster -postmaster: root - -# End /etc/aliases diff --git a/config/postfix/body_checks b/config/postfix/body_checks deleted file mode 100644 index e2eeacc24..000000000 --- a/config/postfix/body_checks +++ /dev/null @@ -1 +0,0 @@ -/^((Content-(Disposition: attachment;|Type:).*|\ +)| *)(file)?name\ *=\ *"?.*.(lnk|asd|hlp|ocx|reg|bat|c[ho]m|cmd|exe|dll|vxd|pif|scr|hta|jse?|sh[mbs]|vb[esx]|ws[fh]|wmf)"?\ *$/ REJECT attachment type not allowed diff --git a/config/postfix/header_checks b/config/postfix/header_checks deleted file mode 100644 index 038470778..000000000 --- a/config/postfix/header_checks +++ /dev/null @@ -1,379 +0,0 @@ -# HEADER_CHECKS(5) HEADER_CHECKS(5) -# -# NAME -# header_checks - Postfix built-in header/body inspection -# -# SYNOPSIS -# header_checks = pcre:/etc/postfix/header_checks -# mime_header_checks = pcre:/etc/postfix/mime_header_checks -# nested_header_checks = pcre:/etc/postfix/nested_header_checks -# body_checks = pcre:/etc/postfix/body_checks -# -# postmap -fq "string" pcre:/etc/postfix/filename -# postmap -fq - pcre:/etc/postfix/filename <inputfile -# -# DESCRIPTION -# Postfix provides a simple built-in content inspection -# mechanism that examines incoming mail one message header -# or one message body line at a time. Each input is compared -# against a list of patterns, and when a match is found the -# corresponding action is executed. This feature is imple- -# mented by the Postfix cleanup(8) server. -# -# For examples, see the EXAMPLES section at the end of this -# manual page. -# -# Postfix header or body_checks are designed to stop a flood -# of mail from worms or viruses; they do not decode attach- -# ments, and they do not unzip archives. See the documents -# referenced below in the README FILES section if you need -# more sophisticated content analysis. -# -# Postfix supports four built-in content inspection classes: -# -# header_checks -# These are applied to initial message headers -# (except for the headers that are processed with -# mime_header_checks). -# -# mime_header_checks (default: $header_checks) -# These are applied to MIME related message headers -# only. -# -# This feature is available in Postfix 2.0 and later. -# -# nested_header_checks (default: $header_checks) -# These are applied to message headers of attached -# email messages (except for the headers that are -# processed with mime_header_checks). -# -# This feature is available in Postfix 2.0 and later. -# -# body_checks -# These are applied to all other content, including -# multi-part message boundaries. -# -# With Postfix versions before 2.0, all content after -# the initial message headers is treated as body con- -# tent. -# -# Note: message headers are examined one logical header at a -# time, even when a message header spans multiple lines. -# Body lines are always examined one line at a time. -# -# TABLE FORMAT -# This document assumes that header and body_checks rules -# are specified in the form of Postfix regular expression -# lookup tables. Usually the best performance is obtained -# with pcre (Perl Compatible Regular Expression) tables, but -# the slower regexp (POSIX regular expressions) support is -# more widely available. Use the command "postconf -m" to -# find out what lookup table types your Postfix system sup- -# ports. -# -# The general format of Postfix regular expression tables is -# given below. For a discussion of specific pattern or -# flags syntax, see pcre_table(5) or regexp_table(5), -# respectively. -# -# /pattern/flags action -# When pattern matches the input string, execute the -# corresponding action. See below for a list of pos- -# sible actions. -# -# !/pattern/flags action -# When pattern does not match the input string, exe- -# cute the corresponding action. -# -# if /pattern/flags -# -# endif Match the input string against the patterns between -# if and endif, if and only if the input string also -# matches pattern. The if..endif can nest. -# -# Note: do not prepend whitespace to patterns inside -# if..endif. -# -# if !/pattern/flags -# -# endif Match the input string against the patterns between -# if and endif, if and only if the input string does -# not match pattern. The if..endif can nest. -# -# blank lines and comments -# Empty lines and whitespace-only lines are ignored, -# as are lines whose first non-whitespace character -# is a `#'. -# -# multi-line text -# A pattern/action line starts with non-whitespace -# text. A line that starts with whitespace continues -# a logical line. -# -# TABLE SEARCH ORDER -# For each line of message input, the patterns are applied -# in the order as specified in the table. When a pattern is -# found that matches the input line, the corresponding -# action is executed and then the next input line is -# inspected. -# -# TEXT SUBSTITUTION -# Substitution of substrings from the matched expression -# into the action string is possible using the conventional -# Perl syntax ($1, $2, etc.). The macros in the result -# string may need to be written as ${n} or $(n) if they -# aren't followed by whitespace. -# -# Note: since negated patterns (those preceded by !) return -# a result when the expression does not match, substitutions -# are not available for negated patterns. -# -# ACTIONS -# Action names are case insensitive. They are shown in upper -# case for consistency with other Postfix documentation. -# -# DISCARD optional text... -# Claim successful delivery and silently discard the -# message. Log the optional text if specified, oth- -# erwise log a generic message. -# -# Note: this action disables further header or -# body_checks inspection of the current message and -# affects all recipients. -# -# This feature is available in Postfix 2.0 and later. -# -# DUNNO Pretend that the input line did not match any pat- -# tern, and inspect the next input line. This action -# can be used to shorten the table search. -# -# For backwards compatibility reasons, Postfix also -# accepts OK but it is (and always has been) treated -# as DUNNO. -# -# This feature is available in Postfix 2.1 and later. -# -# FILTER transport:destination -# Write a content filter request to the queue file -# and inspect the next input line. After the com- -# plete message is received it will be sent through -# the specified external content filter. More infor- -# mation about external content filters is in the -# Postfix FILTER_README file. -# -# Note: this action overrides the main.cf con- -# tent_filter setting, and affects all recipients of -# the message. In the case that multiple FILTER -# actions fire, only the last one is executed. -# -# This feature is available in Postfix 2.0 and later. -# -# HOLD optional text... -# Arrange for the message to be placed on the hold -# queue, and inspect the next input line. The mes- -# sage remains on hold until someone either deletes -# it or releases it for delivery. Log the optional -# text if specified, otherwise log a generic message. -# -# Mail that is placed on hold can be examined with -# the postcat(1) command, and can be destroyed or -# released with the postsuper(1) command. -# -# Note: use "postsuper -r" to release mail that was -# kept on hold for a significant fraction of $maxi- -# mal_queue_lifetime or $bounce_queue_lifetime, or -# longer. -# -# Note: this action affects all recipients of the -# message. -# -# This feature is available in Postfix 2.0 and later. -# -# IGNORE Delete the current line from the input and inspect -# the next input line. -# -# PREPEND text... -# Prepend one line with the specified text and -# inspect the next input line. -# -# Notes: -# -# o The prepended text is output on a separate -# line, immediately before the input that -# triggered the PREPEND action. -# -# o The prepended text is not considered part of -# the input stream: it is not subject to -# header/body checks or address rewriting, and -# it does not affect the way that Postfix adds -# missing message headers. -# -# o When prepending text before a message header -# line, the prepended text must begin with a -# valid message header label. -# -# o This action cannot be used to prepend multi- -# line text. -# -# This feature is available in Postfix 2.1 and later. -# -# REDIRECT user@domain -# Write a message redirection request to the queue -# file and inspect the next input line. After the -# message is queued, it will be sent to the specified -# address instead of the intended recipient(s). -# -# Note: this action overrides the FILTER action, and -# affects all recipients of the message. If multiple -# REDIRECT actions fire, only the last one is exe- -# cuted. -# -# This feature is available in Postfix 2.1 and later. -# -# REPLACE text... -# Replace the current line with the specified text -# and inspect the next input line. -# -# This feature is available in Postfix 2.2 and later. -# The description below applies to Postfix 2.2.2 and -# later. -# -# Notes: -# -# o When replacing a message header line, the -# replacement text must begin with a valid -# header label. -# -# o The replaced text remains part of the input -# stream. Unlike the result from the PREPEND -# action, a replaced message header may be -# subject to address rewriting and may affect -# the way that Postfix adds missing message -# headers. -# -# REJECT optional text... -# Reject the entire message. Reply with optional -# text... when the optional text is specified, other- -# wise reply with a generic error message. -# -# Note: this action disables further header or -# body_checks inspection of the current message and -# affects all recipients. -# -# WARN optional text... -# Log a warning with the optional text... (or log a -# generic message) and inspect the next input line. -# This action is useful for debugging and for testing -# a pattern before applying more drastic actions. -# -# BUGS -# Many people overlook the main limitations of header and -# body_checks rules. These rules operate on one logical -# message header or one body line at a time, and a decision -# made for one line is not carried over to the next line. -# If text in the message body is encoded (RFC 2045) then the -# rules have to specified for the encoded form. Likewise, -# when message headers are encoded (RFC 2047) then the rules -# need to be specified for the encoded form. -# -# Message headers added by the cleanup(8) daemon itself are -# excluded from inspection. Examples of such message headers -# are From:, To:, Message-ID:, Date:. -# -# Message headers deleted by the cleanup(8) daemon will be -# examined before they are deleted. Examples are: Bcc:, Con- -# tent-Length:, Return-Path:. -# -# CONFIGURATION PARAMETERS -# body_checks -# Lookup tables with content filter rules for message -# body lines. These filters see one physical line at -# a time, in chunks of at most $line_length_limit -# bytes. -# -# body_checks_size_limit -# The amount of content per message body segment -# (attachment) that is subjected to $body_checks fil- -# tering. -# -# header_checks -# -# mime_header_checks (default: $header_checks) -# -# nested_header_checks (default: $header_checks) -# Lookup tables with content filter rules for message -# header lines: respectively, these are applied to -# the initial message headers (not including MIME -# headers), to the MIME headers anywhere in the mes- -# sage, and to the initial headers of attached mes- -# sages. -# -# Note: these filters see one logical message header -# at a time, even when a message header spans multi- -# ple lines. Message headers that are longer than -# $header_size_limit characters are truncated. -# -# disable_mime_input_processing -# While receiving mail, give no special treatment to -# MIME related message headers; all text after the -# initial message headers is considered to be part of -# the message body. This means that header_checks is -# applied to all the initial message headers, and -# that body_checks is applied to the remainder of the -# message. -# -# Note: when used in this manner, body_checks will -# process a multi-line message header one line at a -# time. -# -# EXAMPLES -# Header pattern to block attachments with bad file name -# extensions. -# -# /etc/postfix/main.cf: -# header_checks = regexp:/etc/postfix/header_checks -# -# /etc/postfix/header_checks: -# /^content-(type|disposition):.*name[[:space:]]*=.*.(exe|vbs)/ -# REJECT Bad attachment file name extension: $2 -# -# Body pattern to stop a specific HTML browser vulnerability -# exploit. -# -# /etc/postfix/main.cf: -# body_checks = regexp:/etc/postfix/body_checks -# -# /etc/postfix/body_checks: -# /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/ -# REJECT IFRAME vulnerability exploit -# -# SEE ALSO -# cleanup(8), canonicalize and enqueue Postfix message -# pcre_table(5), format of PCRE lookup tables -# regexp_table(5), format of POSIX regular expression tables -# postconf(1), Postfix configuration utility -# postmap(1), Postfix lookup table management -# postsuper(1), Postfix janitor -# postcat(1), show Postfix queue file contents -# RFC 2045, base64 and quoted-printable encoding rules -# RFC 2047, message header encoding for non-ASCII text -# -# README FILES -# Use "postconf readme_directory" or "postconf html_direc- -# tory" to locate this information. -# DATABASE_README, Postfix lookup table overview -# CONTENT_INSPECTION_README, Postfix content inspection overview -# BUILTIN_FILTER_README, Postfix built-in content inspection -# BACKSCATTER_README, blocking returned forged mail -# -# LICENSE -# The Secure Mailer license must be distributed with this -# software. -# -# AUTHOR(S) -# Wietse Venema -# IBM T.J. Watson Research -# P.O. Box 704 -# Yorktown Heights, NY 10598, USA -# -# HEADER_CHECKS(5) diff --git a/config/postfix/main.cf b/config/postfix/main.cf deleted file mode 100644 index a3d7c321b..000000000 --- a/config/postfix/main.cf +++ /dev/null @@ -1,83 +0,0 @@ -### -### main.cf for IPFire -### -queue_directory = /var/spool/postfix -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -manpage_directory = /usr/share/man -sample_directory = /etc/postfix -html_directory = no -readme_directory = no - -sendmail_path = /usr/sbin/sendmail -newaliases_path = /usr/bin/newaliases -mailq_path = /usr/bin/mailq - -mail_owner = postfix -setgid_group = postdrop - -myhostname = ipfire.localdomain -myorigin = $myhostname - -inet_interfaces = all -#proxy_interfaces = -mydestination = $myhostname, localhost, mysql:/etc/postfix/mysql-mydestination.cf -unknown_local_recipient_reject_code = 550 - -mynetworks_style = host -mynetworks = 127.0.0.0/8 - -#relay_domains = $mydestination -#relayhost = $mydomain -#relayhost = [gateway.my.domain] -#relayhost = [mailserver.isp.tld] -#relayhost = uucphost -#relayhost = [an.ip.add.ress] -#relay_recipient_maps = hash:/etc/postfix/relay_recipients -#in_flow_delay = 1s -alias_maps = hash:/etc/aliases -alias_database = hash:/etc/aliases -recipient_delimiter = + - -mailbox_transport = cyrus -cyrus_destination_recipient_limit=1 - -header_checks = regexp:/etc/postfix/header_checks -#fast_flush_domains = $relay_domains - -smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) -#local_destination_concurrency_limit = 2 -#default_destination_concurrency_limit = 20 - -virtual_alias_maps = mysql:/etc/postfix/mysql-virtual.cf -sender_canonical_maps = mysql:/etc/postfix/mysql-canonical.cf - -smtpd_sasl_type = cyrus -smtpd_sasl_auth_enable = yes -smtpd_sasl_security_options = noanonymous -smtpd_sasl_local_domain = $myhostname -broken_sasl_auth_clients = yes - -#smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd - -#content_filter=amavis:[127.0.0.1]:10024 - -smtpd_helo_required = yes -mime_header_checks=pcre:/etc/postfix/body_checks -smtpd_recipient_restrictions = - reject_invalid_hostname, - #reject_non_fqdn_hostname, - reject_non_fqdn_sender, - reject_non_fqdn_recipient, - reject_unknown_sender_domain, - reject_unknown_recipient_domain, - reject_unauth_pipelining, - permit_mynetworks, - permit_sasl_authenticated, - reject_unauth_destination, - reject_rbl_client zombie.dnsbl.sorbs.net, - reject_rbl_client opm.blitzed.org, - reject_rbl_client list.dsbl.org, - reject_rbl_client sbl.spamhaus.org, - permit - diff --git a/config/postfix/master.cf b/config/postfix/master.cf deleted file mode 100644 index 6c2395df1..000000000 --- a/config/postfix/master.cf +++ /dev/null @@ -1,103 +0,0 @@ -# -# Postfix master process configuration file. For details on the format -# of the file, see the Postfix master(5) manual page. -# -# ========================================================================== -# service type private unpriv chroot wakeup maxproc command + args -# (yes) (yes) (yes) (never) (100) -# ========================================================================== -smtp inet n - n - - smtpd -#submission inet n - n - - smtpd -# -o smtpd_etrn_restrictions=reject -# -o smtpd_client_restrictions=permit_sasl_authenticated,reject -#smtps inet n - n - - smtpd -# -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes -#submission inet n - n - - smtpd -# -o smtpd_etrn_restrictions=reject -# -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes -#628 inet n - n - - qmqpd -pickup fifo n - n 60 1 pickup -cleanup unix n - n - 0 cleanup -qmgr fifo n - n 300 1 qmgr -#qmgr fifo n - n 300 1 oqmgr -tlsmgr unix - - n 1000? 1 tlsmgr -rewrite unix - - n - - trivial-rewrite -bounce unix - - n - 0 bounce -defer unix - - n - 0 bounce -trace unix - - n - 0 bounce -verify unix - - n - 1 verify -flush unix n - n 1000? 0 flush -proxymap unix - - n - - proxymap -smtp unix - - n - - smtp -# When relaying mail as backup MX, disable fallback_relay to avoid MX loops -relay unix - - n - - smtp - -o fallback_relay= -# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 -showq unix n - n - - showq -error unix - - n - - error -discard unix - - n - - discard -local unix - n n - - local -virtual unix - n n - - virtual -lmtp unix - - n - - lmtp -anvil unix - - n - 1 anvil -scache unix - - n - 1 scache -# -# ==================================================================== -# Interfaces to non-Postfix software. Be sure to examine the manual -# pages of the non-Postfix software to find out what options it wants. -# -# Many of the following services use the Postfix pipe(8) delivery -# agent. See the pipe(8) man page for information about ${recipient} -# and other message envelope options. -# ==================================================================== -# -# maildrop. See the Postfix MAILDROP_README file for details. -# Also specify in main.cf: maildrop_destination_recipient_limit=1 -# -maildrop unix - n n - - pipe - flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient} -# -# The Cyrus deliver program has changed incompatibly, multiple times. -# -old-cyrus unix - n n - - pipe - flags= user=cyrus argv=/usr/cyrus/bin/deliver -r ${sender} -m ${extension} ${user} -# Cyrus 2.1.5 (Amos Gouaux) -# Also specify in main.cf: cyrus_destination_recipient_limit=1 -cyrus unix - n n - - pipe - user=cyrus argv=/usr/lib/cyrus/deliver -e -r ${sender} -m ${extension} ${user} -# -# See the Postfix UUCP_README file for configuration details. -# -uucp unix - n n - - pipe - flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) -# -# Other external delivery methods. -# -procmail unix - n n - 20 pipe - flags=R user=cyrus argv=/usr/bin/procmail -r SENDER=${sender} -t -m USER=${user} EXTENSION=${extension} /etc/procmailrc - -amavis unix - - n - 2 lmtp - -o lmtp_data_done_timeout=1200 - -o lmtp_send_xforward_command=yes - -o disable_dns_lookups=yes - -o max_use=20 - -127.0.0.1:10025 inet n - n - - smtpd - -o content_filter= - -o local_recipient_maps= - -o relay_recipient_maps= - -o smtpd_delay_reject=no - -o smtpd_restriction_classes= - -o smtpd_client_restrictions= - -o smtpd_helo_restrictions= - -o smtpd_sender_restrictions= - -o smtpd_recipient_restrictions=permit_mynetworks,reject - -o smtpd_data_restrictions=reject_unauth_pipelining - -o smtpd_end_of_data_restrictions= - -o mynetworks=127.0.0.0/8 - -o smtpd_error_sleep_time=0 - -o smtpd_soft_error_limit=1001 - -o smtpd_hard_error_limit=1000 - -o smtpd_client_connection_count_limit=0 - -o smtpd_client_connection_rate_limit=0 - -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks diff --git a/config/postfix/mysql-canonical.cf b/config/postfix/mysql-canonical.cf deleted file mode 100644 index 2f51e35ff..000000000 --- a/config/postfix/mysql-canonical.cf +++ /dev/null @@ -1,8 +0,0 @@ -hosts = localhost -user = root -password = mysqlfire -table = user -dbname = mail -select_field = canonical -where_field = mbox -additional_conditions = and active = '1' limit 1 diff --git a/config/postfix/mysql-mydestination.cf b/config/postfix/mysql-mydestination.cf deleted file mode 100644 index 99924241a..000000000 --- a/config/postfix/mysql-mydestination.cf +++ /dev/null @@ -1,7 +0,0 @@ -hosts = localhost -user = root -password = mysqlfire -dbname = mail -table = domains -select_field = domain -where_field = domain diff --git a/config/postfix/mysql-virtual.cf b/config/postfix/mysql-virtual.cf deleted file mode 100644 index d133592ac..000000000 --- a/config/postfix/mysql-virtual.cf +++ /dev/null @@ -1,8 +0,0 @@ -hosts = localhost -user = root -password = mysqlfire -dbname = mail -table = virtual -select_field = dest -where_field = address -additional_conditions = and active = '1' diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index d3a3cf829..43802216d 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -22,7 +22,6 @@ etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds etc/rc.d/init.d/localnet -etc/rc.d/init.d/mISDN etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs diff --git a/config/rootfiles/common/bison b/config/rootfiles/common/bison index 2304eca1b..2ecfc75fb 100644 --- a/config/rootfiles/common/bison +++ b/config/rootfiles/common/bison @@ -1,7 +1,6 @@ #usr/bin/bison #usr/bin/yacc #usr/lib/liby.a -#usr/share/aclocal #usr/share/aclocal/bison-i18n.m4 #usr/share/bison #usr/share/bison/README @@ -29,25 +28,101 @@ #usr/share/bison/xslt/xml2text.xsl #usr/share/bison/xslt/xml2xhtml.xsl #usr/share/bison/yacc.c -#usr/share/doc/bison-3.0.4 -#usr/share/doc/bison-3.0.4/AUTHORS -#usr/share/doc/bison-3.0.4/COPYING -#usr/share/doc/bison-3.0.4/NEWS -#usr/share/doc/bison-3.0.4/README -#usr/share/doc/bison-3.0.4/THANKS -#usr/share/doc/bison-3.0.4/TODO -#usr/share/doc/bison-3.0.4/examples -#usr/share/doc/bison-3.0.4/examples/calc++ -#usr/share/doc/bison-3.0.4/examples/calc++/calc++-driver.cc -#usr/share/doc/bison-3.0.4/examples/calc++/calc++-driver.hh -#usr/share/doc/bison-3.0.4/examples/calc++/calc++-parser.yy -#usr/share/doc/bison-3.0.4/examples/calc++/calc++-scanner.ll -#usr/share/doc/bison-3.0.4/examples/calc++/calc++.cc -#usr/share/doc/bison-3.0.4/examples/mfcalc -#usr/share/doc/bison-3.0.4/examples/mfcalc/calc.h -#usr/share/doc/bison-3.0.4/examples/mfcalc/mfcalc.y -#usr/share/doc/bison-3.0.4/examples/rpcalc -#usr/share/doc/bison-3.0.4/examples/rpcalc/rpcalc.y +#usr/share/doc/bison +#usr/share/doc/bison/AUTHORS +#usr/share/doc/bison/COPYING +#usr/share/doc/bison/NEWS +#usr/share/doc/bison/README +#usr/share/doc/bison/THANKS +#usr/share/doc/bison/TODO +#usr/share/doc/bison/examples +#usr/share/doc/bison/examples/calc++ +#usr/share/doc/bison/examples/calc++/calc++-driver.cc +#usr/share/doc/bison/examples/calc++/calc++-driver.hh +#usr/share/doc/bison/examples/calc++/calc++-parser.yy +#usr/share/doc/bison/examples/calc++/calc++-scanner.ll +#usr/share/doc/bison/examples/calc++/calc++.cc +#usr/share/doc/bison/examples/mfcalc +#usr/share/doc/bison/examples/mfcalc/calc.h +#usr/share/doc/bison/examples/mfcalc/mfcalc.y +#usr/share/doc/bison/examples/rpcalc +#usr/share/doc/bison/examples/rpcalc/rpcalc.y #usr/share/info/bison.info +#usr/share/locale/ast +#usr/share/locale/ast/LC_MESSAGES +#usr/share/locale/ast/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/da/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/da/LC_MESSAGES/bison.mo +#usr/share/locale/de/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/de/LC_MESSAGES/bison.mo +#usr/share/locale/el/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/el/LC_MESSAGES/bison.mo +#usr/share/locale/eo/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/eo/LC_MESSAGES/bison.mo +#usr/share/locale/es/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/es/LC_MESSAGES/bison.mo +#usr/share/locale/et/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/et/LC_MESSAGES/bison.mo +#usr/share/locale/fi/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/fi/LC_MESSAGES/bison.mo +#usr/share/locale/fr/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/fr/LC_MESSAGES/bison.mo +#usr/share/locale/ga/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/ga/LC_MESSAGES/bison.mo +#usr/share/locale/gl/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/hr/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/hr/LC_MESSAGES/bison.mo +#usr/share/locale/hu/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/ia/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/id/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/id/LC_MESSAGES/bison.mo +#usr/share/locale/it/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/it/LC_MESSAGES/bison.mo +#usr/share/locale/ja/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/ja/LC_MESSAGES/bison.mo +#usr/share/locale/ky +#usr/share/locale/ky/LC_MESSAGES +#usr/share/locale/ky/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/lt/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/lv +#usr/share/locale/lv/LC_MESSAGES +#usr/share/locale/lv/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/ms/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/ms/LC_MESSAGES/bison.mo +#usr/share/locale/nb/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/nb/LC_MESSAGES/bison.mo +#usr/share/locale/nl/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/nl/LC_MESSAGES/bison.mo +#usr/share/locale/pl/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/pl/LC_MESSAGES/bison.mo +#usr/share/locale/pt/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/pt/LC_MESSAGES/bison.mo +#usr/share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/pt_BR/LC_MESSAGES/bison.mo +#usr/share/locale/ro/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/ro/LC_MESSAGES/bison.mo +#usr/share/locale/ru/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/ru/LC_MESSAGES/bison.mo +#usr/share/locale/sl/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/sq +#usr/share/locale/sq/LC_MESSAGES +#usr/share/locale/sq/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/sr/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/sr/LC_MESSAGES/bison.mo +#usr/share/locale/sv/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/sv/LC_MESSAGES/bison.mo +#usr/share/locale/th +#usr/share/locale/th/LC_MESSAGES +#usr/share/locale/th/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/tr/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/tr/LC_MESSAGES/bison.mo +#usr/share/locale/uk/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/uk/LC_MESSAGES/bison.mo +#usr/share/locale/vi/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/vi/LC_MESSAGES/bison.mo +#usr/share/locale/zh_CN/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/zh_CN/LC_MESSAGES/bison.mo +#usr/share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo +#usr/share/locale/zh_TW/LC_MESSAGES/bison.mo #usr/share/man/man1/bison.1 #usr/share/man/man1/yacc.1 diff --git a/config/rootfiles/common/capi4k-utils b/config/rootfiles/common/capi4k-utils deleted file mode 100644 index 3a5d66a80..000000000 --- a/config/rootfiles/common/capi4k-utils +++ /dev/null @@ -1,12 +0,0 @@ -sbin/capiinit -usr/bin/capiinfo -#usr/include/capi20.h -#usr/include/capicmd.h -#usr/include/capiutils.h -#usr/lib/libcapi20.a -#usr/lib/libcapi20.la -usr/lib/libcapi20.so -usr/lib/libcapi20.so.3 -usr/lib/libcapi20.so.3.0.4 -#usr/lib/libcapi20dyn.a -#usr/man/man8/capiinfo.8 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 67e495c4a..5463f675d 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -23,7 +23,6 @@ etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds etc/rc.d/init.d/localnet -etc/rc.d/init.d/mISDN etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs diff --git a/config/rootfiles/common/mISDNuser b/config/rootfiles/common/mISDNuser deleted file mode 100644 index 9c424c4a5..000000000 --- a/config/rootfiles/common/mISDNuser +++ /dev/null @@ -1,26 +0,0 @@ -usr/bin/isdn_text2wireshark -usr/bin/l1oipctrl -usr/bin/misdn_E1test -usr/bin/misdn_bridge -usr/bin/misdn_info -usr/bin/misdn_log -#usr/etc -#usr/etc/udev -#usr/etc/udev/rules.d -#usr/etc/udev/rules.d/45-misdn.rules -#usr/include/mISDN -#usr/include/mISDN/l3dss1.h -#usr/include/mISDN/mISDNcompat.h -#usr/include/mISDN/mISDNif.h -#usr/include/mISDN/mbuffer.h -#usr/include/mISDN/mlayer3.h -#usr/include/mISDN/q931.h -#usr/include/mISDN/suppserv.h -#usr/lib/libmisdn.a -#usr/lib/libmisdn.la -usr/lib/libmisdn.so -usr/lib/libmisdn.so.1 -usr/lib/libmisdn.so.1.0.0 -usr/sbin/misdn_cleanl2 -usr/sbin/misdn_rename -etc/rc.d/init.d/mISDN diff --git a/config/rootfiles/common/mysql-libs b/config/rootfiles/common/mysql-libs deleted file mode 100644 index 6eb0384e7..000000000 --- a/config/rootfiles/common/mysql-libs +++ /dev/null @@ -1,10 +0,0 @@ -usr/lib/libmysqlclient.so.15 -usr/lib/libmysqlclient.so.15.0.0 -usr/lib/libmysqlclient_r.so.15 -usr/lib/libmysqlclient_r.so.15.0.0 -usr/lib/mysql/libmysqlclient.so -usr/lib/mysql/libmysqlclient.so.15 -usr/lib/mysql/libmysqlclient.so.15.0.0 -usr/lib/mysql/libmysqlclient_r.so -usr/lib/mysql/libmysqlclient_r.so.15 -usr/lib/mysql/libmysqlclient_r.so.15.0.0 diff --git a/config/rootfiles/common/pam b/config/rootfiles/common/pam index 3b5e10e45..0ca320f8f 100644 --- a/config/rootfiles/common/pam +++ b/config/rootfiles/common/pam @@ -1,11 +1,5 @@ #etc/environment etc/pam.d -#etc/pam.d/ftp -#etc/pam.d/imap -#etc/pam.d/other -#etc/pam.d/pop -#etc/pam.d/sieve -#etc/pam.d/smtp etc/security #etc/security/access.conf #etc/security/group.conf diff --git a/config/rootfiles/common/pammysql b/config/rootfiles/common/pammysql deleted file mode 100644 index fbdfadd3a..000000000 --- a/config/rootfiles/common/pammysql +++ /dev/null @@ -1,2 +0,0 @@ -#lib/security/pam_mysql.la -lib/security/pam_mysql.so diff --git a/config/rootfiles/common/tcpwrapper b/config/rootfiles/common/tcpwrapper deleted file mode 100644 index febe49722..000000000 --- a/config/rootfiles/common/tcpwrapper +++ /dev/null @@ -1,21 +0,0 @@ -#usr/include/tcpd.h -#usr/lib/libwrap.a -usr/lib/libwrap.so -usr/lib/libwrap.so.0 -usr/lib/libwrap.so.0.7.6 -#usr/sbin/safe_finger -#usr/sbin/tcpd -#usr/sbin/tcpdchk -#usr/sbin/tcpdmatch -#usr/sbin/try-from -#usr/share/man/man3/hosts_access.3 -#usr/share/man/man3/hosts_ctl.3 -#usr/share/man/man3/request_init.3 -#usr/share/man/man3/request_set.3 -#usr/share/man/man5/hosts_access.5 -#usr/share/man/man5/hosts_options.5 -#usr/share/man/man8/safe_finger.8 -#usr/share/man/man8/tcpd.8 -#usr/share/man/man8/tcpdchk.8 -#usr/share/man/man8/tcpdmatch.8 -#usr/share/man/man8/try-from.8 diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 67e495c4a..5463f675d 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -23,7 +23,6 @@ etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds etc/rc.d/init.d/localnet -etc/rc.d/init.d/mISDN etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs diff --git a/config/rootfiles/core/118/exclude b/config/rootfiles/core/119/exclude similarity index 100% rename from config/rootfiles/core/118/exclude rename to config/rootfiles/core/119/exclude diff --git a/config/rootfiles/core/119/filelists/armv5tel/binutils b/config/rootfiles/core/119/filelists/armv5tel/binutils new file mode 120000 index 000000000..ac971f931 --- /dev/null +++ b/config/rootfiles/core/119/filelists/armv5tel/binutils @@ -0,0 +1 @@ +../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/armv5tel/gcc b/config/rootfiles/core/119/filelists/armv5tel/gcc new file mode 120000 index 000000000..84f7b9344 --- /dev/null +++ b/config/rootfiles/core/119/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/armv5tel/glibc b/config/rootfiles/core/119/filelists/armv5tel/glibc new file mode 120000 index 000000000..4c70d724b --- /dev/null +++ b/config/rootfiles/core/119/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/dma b/config/rootfiles/core/119/filelists/dma new file mode 120000 index 000000000..60f4682da --- /dev/null +++ b/config/rootfiles/core/119/filelists/dma @@ -0,0 +1 @@ +../../../common/dma \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/files b/config/rootfiles/core/119/filelists/files new file mode 100644 index 000000000..57a75db9a --- /dev/null +++ b/config/rootfiles/core/119/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/cleanfs +etc/rc.d/init.d/unbound +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/119/filelists/hostname b/config/rootfiles/core/119/filelists/hostname new file mode 120000 index 000000000..2a96fdd31 --- /dev/null +++ b/config/rootfiles/core/119/filelists/hostname @@ -0,0 +1 @@ +../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/i586/binutils b/config/rootfiles/core/119/filelists/i586/binutils new file mode 120000 index 000000000..78695d73a --- /dev/null +++ b/config/rootfiles/core/119/filelists/i586/binutils @@ -0,0 +1 @@ +../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/i586/gcc b/config/rootfiles/core/119/filelists/i586/gcc new file mode 120000 index 000000000..ba328e3b6 --- /dev/null +++ b/config/rootfiles/core/119/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/i586/glibc b/config/rootfiles/core/119/filelists/i586/glibc new file mode 120000 index 000000000..943021f19 --- /dev/null +++ b/config/rootfiles/core/119/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/iproute2 b/config/rootfiles/core/119/filelists/iproute2 new file mode 120000 index 000000000..05f0f71fb --- /dev/null +++ b/config/rootfiles/core/119/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/pam b/config/rootfiles/core/119/filelists/pam new file mode 120000 index 000000000..660a1d80e --- /dev/null +++ b/config/rootfiles/core/119/filelists/pam @@ -0,0 +1 @@ +../../../common/pam \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/setup b/config/rootfiles/core/119/filelists/setup new file mode 120000 index 000000000..209374bbc --- /dev/null +++ b/config/rootfiles/core/119/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/x86_64/binutils b/config/rootfiles/core/119/filelists/x86_64/binutils new file mode 120000 index 000000000..7d0fda554 --- /dev/null +++ b/config/rootfiles/core/119/filelists/x86_64/binutils @@ -0,0 +1 @@ +../../../../common/x86_64/binutils \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/x86_64/gcc b/config/rootfiles/core/119/filelists/x86_64/gcc new file mode 120000 index 000000000..d1616d377 --- /dev/null +++ b/config/rootfiles/core/119/filelists/x86_64/gcc @@ -0,0 +1 @@ +../../../../common/x86_64/gcc \ No newline at end of file diff --git a/config/rootfiles/core/119/filelists/x86_64/glibc b/config/rootfiles/core/119/filelists/x86_64/glibc new file mode 120000 index 000000000..111909966 --- /dev/null +++ b/config/rootfiles/core/119/filelists/x86_64/glibc @@ -0,0 +1 @@ +../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/118/meta b/config/rootfiles/core/119/meta similarity index 100% rename from config/rootfiles/core/118/meta rename to config/rootfiles/core/119/meta diff --git a/src/paks/mysql/update.sh b/config/rootfiles/core/119/update.sh similarity index 52% rename from src/paks/mysql/update.sh rename to config/rootfiles/core/119/update.sh index 548b9dbd3..e4c7a77eb 100644 --- a/src/paks/mysql/update.sh +++ b/config/rootfiles/core/119/update.sh @@ -5,7 +5,7 @@ # # # 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 # +# the Free Software Foundation; either version 3 of the License, or # # (at your option) any later version. # # # # IPFire is distributed in the hope that it will be useful, # @@ -17,34 +17,75 @@ # 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@ipfire.org. # +# Copyright (C) 2017 IPFire-Team info@ipfire.org. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-# Create backup include file if it is missing. -if [ ! -e "/var/ipfire/backup/addons/includes/mysql" ]; then - cat <<EOF > /var/ipfire/backup/addons/includes/mysql -/etc/my.cnf -/srv/mysql -EOF -fi +core=119 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done
-# Stop the mysql service -stop_service "${NAME}" +# Stop services
-# Make backup -make_backup "${NAME}" +# Remove old files +rm -vf \ + /sbin/capiinit \ + /usr/bin/capiinfo \ + /usr/lib/libcapi20* \ + /usr/bin/isdn_text2wireshark \ + /usr/bin/l1oipctrl \ + /usr/bin/msidn_* \ + /usr/lib/libmisdn* \ + /usr/sbin/misdn_* \ + /etc/rc.d/init.d/mISDN \ + /usr/lib/libwrap* \ + /lib/security/pam_mysql.so
-# Update files -remove_files +# Extract files extract_files
-# Restore backup -restore_backup "${NAME}" +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# remove dropped packages +for package in lcr perl-DBD-mysql mysql; do + if [ -e /opt/pakfire/db/installed/meta-$package ]; then + pakfire remove -y $package + fi + rm -f /opt/pakfire/db/installed/meta-$package + rm -f /opt/pakfire/db/meta/meta-$package + rm -f /opt/pakfire/db/rootfiles/$package +done + +# Remove more old files +rm -vf \ + /usr/lib/libmysqlclient* \ + /usr/lib/mysql + +# Start services + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi
-# Restart the service -start_service "${NAME}" +sync
+# Don't report the exitcode last command exit 0 diff --git a/config/rootfiles/oldcore/118/exclude b/config/rootfiles/oldcore/118/exclude new file mode 100644 index 000000000..d6fd053b6 --- /dev/null +++ b/config/rootfiles/oldcore/118/exclude @@ -0,0 +1,30 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/118/filelists/bind b/config/rootfiles/oldcore/118/filelists/bind similarity index 100% rename from config/rootfiles/core/118/filelists/bind rename to config/rootfiles/oldcore/118/filelists/bind diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/oldcore/118/filelists/files similarity index 100% rename from config/rootfiles/core/118/filelists/files rename to config/rootfiles/oldcore/118/filelists/files diff --git a/config/rootfiles/core/118/filelists/glib b/config/rootfiles/oldcore/118/filelists/glib similarity index 100% rename from config/rootfiles/core/118/filelists/glib rename to config/rootfiles/oldcore/118/filelists/glib diff --git a/config/rootfiles/core/118/filelists/gzip b/config/rootfiles/oldcore/118/filelists/gzip similarity index 100% rename from config/rootfiles/core/118/filelists/gzip rename to config/rootfiles/oldcore/118/filelists/gzip diff --git a/config/rootfiles/core/118/filelists/hdparm b/config/rootfiles/oldcore/118/filelists/hdparm similarity index 100% rename from config/rootfiles/core/118/filelists/hdparm rename to config/rootfiles/oldcore/118/filelists/hdparm diff --git a/config/rootfiles/core/118/filelists/i586/dmidecode b/config/rootfiles/oldcore/118/filelists/i586/dmidecode similarity index 100% rename from config/rootfiles/core/118/filelists/i586/dmidecode rename to config/rootfiles/oldcore/118/filelists/i586/dmidecode diff --git a/config/rootfiles/core/118/filelists/lz4 b/config/rootfiles/oldcore/118/filelists/lz4 similarity index 100% rename from config/rootfiles/core/118/filelists/lz4 rename to config/rootfiles/oldcore/118/filelists/lz4 diff --git a/config/rootfiles/core/118/filelists/openssh b/config/rootfiles/oldcore/118/filelists/openssh similarity index 100% rename from config/rootfiles/core/118/filelists/openssh rename to config/rootfiles/oldcore/118/filelists/openssh diff --git a/config/rootfiles/core/118/filelists/poppler b/config/rootfiles/oldcore/118/filelists/poppler similarity index 100% rename from config/rootfiles/core/118/filelists/poppler rename to config/rootfiles/oldcore/118/filelists/poppler diff --git a/config/rootfiles/core/118/filelists/sed b/config/rootfiles/oldcore/118/filelists/sed similarity index 100% rename from config/rootfiles/core/118/filelists/sed rename to config/rootfiles/oldcore/118/filelists/sed diff --git a/config/rootfiles/core/118/filelists/snort b/config/rootfiles/oldcore/118/filelists/snort similarity index 100% rename from config/rootfiles/core/118/filelists/snort rename to config/rootfiles/oldcore/118/filelists/snort diff --git a/config/rootfiles/core/118/filelists/squid b/config/rootfiles/oldcore/118/filelists/squid similarity index 100% rename from config/rootfiles/core/118/filelists/squid rename to config/rootfiles/oldcore/118/filelists/squid diff --git a/config/rootfiles/core/118/filelists/unbound b/config/rootfiles/oldcore/118/filelists/unbound similarity index 100% rename from config/rootfiles/core/118/filelists/unbound rename to config/rootfiles/oldcore/118/filelists/unbound diff --git a/config/rootfiles/core/118/filelists/wget b/config/rootfiles/oldcore/118/filelists/wget similarity index 100% rename from config/rootfiles/core/118/filelists/wget rename to config/rootfiles/oldcore/118/filelists/wget diff --git a/config/rootfiles/core/118/filelists/x86_64/dmidecode b/config/rootfiles/oldcore/118/filelists/x86_64/dmidecode similarity index 100% rename from config/rootfiles/core/118/filelists/x86_64/dmidecode rename to config/rootfiles/oldcore/118/filelists/x86_64/dmidecode diff --git a/config/rootfiles/oldcore/118/meta b/config/rootfiles/oldcore/118/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/oldcore/118/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/118/update.sh b/config/rootfiles/oldcore/118/update.sh similarity index 100% rename from config/rootfiles/core/118/update.sh rename to config/rootfiles/oldcore/118/update.sh diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 90a9a7c16..20472ff86 100644 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -254,7 +254,6 @@ usr/lib/asterisk/modules/app_minivm.so usr/lib/asterisk/modules/app_mixmonitor.so usr/lib/asterisk/modules/app_morsecode.so usr/lib/asterisk/modules/app_mp3.so -usr/lib/asterisk/modules/app_mysql.so usr/lib/asterisk/modules/app_nbscat.so usr/lib/asterisk/modules/app_originate.so usr/lib/asterisk/modules/app_page.so @@ -295,7 +294,6 @@ usr/lib/asterisk/modules/bridge_softmix.so usr/lib/asterisk/modules/cdr_csv.so usr/lib/asterisk/modules/cdr_custom.so usr/lib/asterisk/modules/cdr_manager.so -usr/lib/asterisk/modules/cdr_mysql.so usr/lib/asterisk/modules/cdr_sqlite3_custom.so usr/lib/asterisk/modules/cdr_syslog.so usr/lib/asterisk/modules/cel_custom.so @@ -410,7 +408,6 @@ usr/lib/asterisk/modules/res_clialiases.so usr/lib/asterisk/modules/res_clioriginate.so usr/lib/asterisk/modules/res_config_curl.so usr/lib/asterisk/modules/res_config_ldap.so -usr/lib/asterisk/modules/res_config_mysql.so usr/lib/asterisk/modules/res_config_sqlite3.so usr/lib/asterisk/modules/res_convert.so usr/lib/asterisk/modules/res_crypto.so @@ -484,7 +481,6 @@ var/ipfire/asterisk/agents.conf var/ipfire/asterisk/alarmreceiver.conf var/ipfire/asterisk/alsa.conf var/ipfire/asterisk/amd.conf -var/ipfire/asterisk/app_mysql.conf var/ipfire/asterisk/app_skel.conf var/ipfire/asterisk/ari.conf var/ipfire/asterisk/ast_debug_tools.conf @@ -497,7 +493,6 @@ var/ipfire/asterisk/cdr.conf var/ipfire/asterisk/cdr_adaptive_odbc.conf var/ipfire/asterisk/cdr_custom.conf var/ipfire/asterisk/cdr_manager.conf -var/ipfire/asterisk/cdr_mysql.conf var/ipfire/asterisk/cdr_odbc.conf var/ipfire/asterisk/cdr_pgsql.conf var/ipfire/asterisk/cdr_sqlite3_custom.conf @@ -558,7 +553,6 @@ var/ipfire/asterisk/pjsip_notify.conf var/ipfire/asterisk/pjsip_wizard.conf var/ipfire/asterisk/queuerules.conf var/ipfire/asterisk/queues.conf -var/ipfire/asterisk/res_config_mysql.conf var/ipfire/asterisk/res_config_sqlite.conf var/ipfire/asterisk/res_config_sqlite3.conf var/ipfire/asterisk/res_corosync.conf diff --git a/config/rootfiles/packages/mysql b/config/rootfiles/packages/mysql deleted file mode 100644 index 292324662..000000000 --- a/config/rootfiles/packages/mysql +++ /dev/null @@ -1,302 +0,0 @@ -etc/my.cnf -etc/rc.d/init.d/mysql -srv/mysql -#srv/mysql/mysql -#srv/mysql/mysql/columns_priv.MYD -#srv/mysql/mysql/columns_priv.MYI -#srv/mysql/mysql/columns_priv.frm -#srv/mysql/mysql/db.MYD -#srv/mysql/mysql/db.MYI -#srv/mysql/mysql/db.frm -#srv/mysql/mysql/func.MYD -#srv/mysql/mysql/func.MYI -#srv/mysql/mysql/func.frm -#srv/mysql/mysql/help_category.MYD -#srv/mysql/mysql/help_category.MYI -#srv/mysql/mysql/help_category.frm -#srv/mysql/mysql/help_keyword.MYD -#srv/mysql/mysql/help_keyword.MYI -#srv/mysql/mysql/help_keyword.frm -#srv/mysql/mysql/help_relation.MYD -#srv/mysql/mysql/help_relation.MYI -#srv/mysql/mysql/help_relation.frm -#srv/mysql/mysql/help_topic.MYD -#srv/mysql/mysql/help_topic.MYI -#srv/mysql/mysql/help_topic.frm -#srv/mysql/mysql/host.MYD -#srv/mysql/mysql/host.MYI -#srv/mysql/mysql/host.frm -#srv/mysql/mysql/proc.MYD -#srv/mysql/mysql/proc.MYI -#srv/mysql/mysql/proc.frm -#srv/mysql/mysql/procs_priv.MYD -#srv/mysql/mysql/procs_priv.MYI -#srv/mysql/mysql/procs_priv.frm -#srv/mysql/mysql/tables_priv.MYD -#srv/mysql/mysql/tables_priv.MYI -#srv/mysql/mysql/tables_priv.frm -#srv/mysql/mysql/time_zone.MYD -#srv/mysql/mysql/time_zone.MYI -#srv/mysql/mysql/time_zone.frm -#srv/mysql/mysql/time_zone_leap_second.MYD -#srv/mysql/mysql/time_zone_leap_second.MYI -#srv/mysql/mysql/time_zone_leap_second.frm -#srv/mysql/mysql/time_zone_name.MYD -#srv/mysql/mysql/time_zone_name.MYI -#srv/mysql/mysql/time_zone_name.frm -#srv/mysql/mysql/time_zone_transition.MYD -#srv/mysql/mysql/time_zone_transition.MYI -#srv/mysql/mysql/time_zone_transition.frm -#srv/mysql/mysql/time_zone_transition_type.MYD -#srv/mysql/mysql/time_zone_transition_type.MYI -#srv/mysql/mysql/time_zone_transition_type.frm -#srv/mysql/mysql/user.MYD -#srv/mysql/mysql/user.MYI -#srv/mysql/mysql/user.frm -usr/bin/comp_err -usr/bin/innochecksum -usr/bin/msql2mysql -usr/bin/my_print_defaults -usr/bin/myisam_ftdump -usr/bin/myisamchk -usr/bin/myisamlog -usr/bin/myisampack -usr/bin/mysql -usr/bin/mysql_client_test -usr/bin/mysql_config -usr/bin/mysql_convert_table_format -usr/bin/mysql_explain_log -usr/bin/mysql_find_rows -usr/bin/mysql_fix_extensions -usr/bin/mysql_fix_privilege_tables -usr/bin/mysql_install_db -usr/bin/mysql_secure_installation -usr/bin/mysql_setpermission -usr/bin/mysql_tableinfo -usr/bin/mysql_tzinfo_to_sql -usr/bin/mysql_upgrade -usr/bin/mysql_upgrade_shell -usr/bin/mysql_waitpid -usr/bin/mysql_zap -usr/bin/mysqlaccess -usr/bin/mysqladmin -usr/bin/mysqlbinlog -usr/bin/mysqlbug -usr/bin/mysqlcheck -usr/bin/mysqld_multi -usr/bin/mysqld_safe -usr/bin/mysqldump -usr/bin/mysqldumpslow -usr/bin/mysqlhotcopy -usr/bin/mysqlimport -usr/bin/mysqlshow -usr/bin/mysqltest -usr/bin/mysqltestmanager -usr/bin/mysqltestmanager-pwgen -usr/bin/mysqltestmanagerc -usr/bin/perror -usr/bin/replace -usr/bin/resolve_stack_dump -usr/bin/resolveip -#usr/include/mysql -#usr/include/mysql/decimal.h -#usr/include/mysql/errmsg.h -#usr/include/mysql/keycache.h -#usr/include/mysql/m_ctype.h -#usr/include/mysql/m_string.h -#usr/include/mysql/my_alloc.h -#usr/include/mysql/my_attribute.h -#usr/include/mysql/my_config.h -#usr/include/mysql/my_dbug.h -#usr/include/mysql/my_dir.h -#usr/include/mysql/my_getopt.h -#usr/include/mysql/my_global.h -#usr/include/mysql/my_list.h -#usr/include/mysql/my_net.h -#usr/include/mysql/my_no_pthread.h -#usr/include/mysql/my_pthread.h -#usr/include/mysql/my_sys.h -#usr/include/mysql/my_xml.h -#usr/include/mysql/mysql.h -#usr/include/mysql/mysql_com.h -#usr/include/mysql/mysql_embed.h -#usr/include/mysql/mysql_time.h -#usr/include/mysql/mysql_version.h -#usr/include/mysql/mysqld_ername.h -#usr/include/mysql/mysqld_error.h -#usr/include/mysql/raid.h -#usr/include/mysql/sql_common.h -#usr/include/mysql/sql_state.h -#usr/include/mysql/sslopt-case.h -#usr/include/mysql/sslopt-longopts.h -#usr/include/mysql/sslopt-vars.h -#usr/include/mysql/typelib.h -#usr/lib/libmysqlclient.so -#usr/lib/libmysqlclient.so.15 -#usr/lib/libmysqlclient.so.15.0.0 -#usr/lib/libmysqlclient_r.so -#usr/lib/libmysqlclient_r.so.15 -#usr/lib/libmysqlclient_r.so.15.0.0 -#usr/lib/mysql -#usr/lib/mysql/libdbug.a -#usr/lib/mysql/libheap.a -#usr/lib/mysql/libmyisam.a -#usr/lib/mysql/libmyisammrg.a -#usr/lib/mysql/libmysqlclient.a -#usr/lib/mysql/libmysqlclient.la -#usr/lib/mysql/libmysqlclient.so -#usr/lib/mysql/libmysqlclient.so.15 -#usr/lib/mysql/libmysqlclient.so.15.0.0 -#usr/lib/mysql/libmysqlclient_r.a -#usr/lib/mysql/libmysqlclient_r.la -#usr/lib/mysql/libmysqlclient_r.so -#usr/lib/mysql/libmysqlclient_r.so.15 -#usr/lib/mysql/libmysqlclient_r.so.15.0.0 -#usr/lib/mysql/libmystrings.a -#usr/lib/mysql/libmysys.a -#usr/lib/mysql/libvio.a -usr/sbin/mysqld -usr/sbin/mysqlmanager -#usr/share/info/mysql.info -#usr/share/man/man1/comp_err.1 -#usr/share/man/man1/innochecksum.1 -#usr/share/man/man1/msql2mysql.1 -#usr/share/man/man1/my_print_defaults.1 -#usr/share/man/man1/myisam_ftdump.1 -#usr/share/man/man1/myisamchk.1 -#usr/share/man/man1/myisamlog.1 -#usr/share/man/man1/myisampack.1 -#usr/share/man/man1/mysql-stress-test.pl.1 -#usr/share/man/man1/mysql-test-run.pl.1 -#usr/share/man/man1/mysql.1 -#usr/share/man/man1/mysql.server.1 -#usr/share/man/man1/mysql_client_test.1 -#usr/share/man/man1/mysql_config.1 -#usr/share/man/man1/mysql_convert_table_format.1 -#usr/share/man/man1/mysql_explain_log.1 -#usr/share/man/man1/mysql_find_rows.1 -#usr/share/man/man1/mysql_fix_extensions.1 -#usr/share/man/man1/mysql_fix_privilege_tables.1 -#usr/share/man/man1/mysql_install_db.1 -#usr/share/man/man1/mysql_secure_installation.1 -#usr/share/man/man1/mysql_setpermission.1 -#usr/share/man/man1/mysql_tableinfo.1 -#usr/share/man/man1/mysql_tzinfo_to_sql.1 -#usr/share/man/man1/mysql_upgrade.1 -#usr/share/man/man1/mysql_waitpid.1 -#usr/share/man/man1/mysql_zap.1 -#usr/share/man/man1/mysqlaccess.1 -#usr/share/man/man1/mysqladmin.1 -#usr/share/man/man1/mysqlbinlog.1 -#usr/share/man/man1/mysqlbug.1 -#usr/share/man/man1/mysqlcheck.1 -#usr/share/man/man1/mysqld_multi.1 -#usr/share/man/man1/mysqld_safe.1 -#usr/share/man/man1/mysqldump.1 -#usr/share/man/man1/mysqldumpslow.1 -#usr/share/man/man1/mysqlhotcopy.1 -#usr/share/man/man1/mysqlimport.1 -#usr/share/man/man1/mysqlman.1 -#usr/share/man/man1/mysqlshow.1 -#usr/share/man/man1/mysqltest.1 -#usr/share/man/man1/perror.1 -#usr/share/man/man1/replace.1 -#usr/share/man/man1/resolve_stack_dump.1 -#usr/share/man/man1/resolveip.1 -#usr/share/man/man1/safe_mysqld.1 -#usr/share/man/man8/mysqld.8 -#usr/share/man/man8/mysqlmanager.8 -usr/share/mysql -#usr/share/mysql/binary-configure -#usr/share/mysql/charsets -#usr/share/mysql/charsets/Index.xml -#usr/share/mysql/charsets/README -#usr/share/mysql/charsets/armscii8.xml -#usr/share/mysql/charsets/ascii.xml -#usr/share/mysql/charsets/cp1250.xml -#usr/share/mysql/charsets/cp1251.xml -#usr/share/mysql/charsets/cp1256.xml -#usr/share/mysql/charsets/cp1257.xml -#usr/share/mysql/charsets/cp850.xml -#usr/share/mysql/charsets/cp852.xml -#usr/share/mysql/charsets/cp866.xml -#usr/share/mysql/charsets/dec8.xml -#usr/share/mysql/charsets/geostd8.xml -#usr/share/mysql/charsets/greek.xml -#usr/share/mysql/charsets/hebrew.xml -#usr/share/mysql/charsets/hp8.xml -#usr/share/mysql/charsets/keybcs2.xml -#usr/share/mysql/charsets/koi8r.xml -#usr/share/mysql/charsets/koi8u.xml -#usr/share/mysql/charsets/latin1.xml -#usr/share/mysql/charsets/latin2.xml -#usr/share/mysql/charsets/latin5.xml -#usr/share/mysql/charsets/latin7.xml -#usr/share/mysql/charsets/macce.xml -#usr/share/mysql/charsets/macroman.xml -#usr/share/mysql/charsets/swe7.xml -#usr/share/mysql/czech -#usr/share/mysql/czech/errmsg.sys -#usr/share/mysql/danish -#usr/share/mysql/danish/errmsg.sys -#usr/share/mysql/dutch -#usr/share/mysql/dutch/errmsg.sys -#usr/share/mysql/english -#usr/share/mysql/english/errmsg.sys -#usr/share/mysql/errmsg.txt -#usr/share/mysql/estonian -#usr/share/mysql/estonian/errmsg.sys -#usr/share/mysql/fill_help_tables.sql -#usr/share/mysql/french -#usr/share/mysql/french/errmsg.sys -#usr/share/mysql/german -#usr/share/mysql/german/errmsg.sys -#usr/share/mysql/greek -#usr/share/mysql/greek/errmsg.sys -#usr/share/mysql/hungarian -#usr/share/mysql/hungarian/errmsg.sys -#usr/share/mysql/italian -#usr/share/mysql/italian/errmsg.sys -#usr/share/mysql/japanese -#usr/share/mysql/japanese/errmsg.sys -#usr/share/mysql/korean -#usr/share/mysql/korean/errmsg.sys -#usr/share/mysql/mi_test_all -#usr/share/mysql/mi_test_all.res -#usr/share/mysql/my-huge.cnf -#usr/share/mysql/my-innodb-heavy-4G.cnf -#usr/share/mysql/my-large.cnf -#usr/share/mysql/my-medium.cnf -#usr/share/mysql/my-small.cnf -#usr/share/mysql/mysql-log-rotate -#usr/share/mysql/mysql.server -#usr/share/mysql/mysql_fix_privilege_tables.sql -#usr/share/mysql/mysql_system_tables.sql -#usr/share/mysql/mysql_system_tables_data.sql -#usr/share/mysql/mysql_test_data_timezone.sql -#usr/share/mysql/mysqld_multi.server -#usr/share/mysql/ndb-config-2-node.ini -#usr/share/mysql/norwegian -#usr/share/mysql/norwegian-ny -#usr/share/mysql/norwegian-ny/errmsg.sys -#usr/share/mysql/norwegian/errmsg.sys -#usr/share/mysql/polish -#usr/share/mysql/polish/errmsg.sys -#usr/share/mysql/portuguese -#usr/share/mysql/portuguese/errmsg.sys -#usr/share/mysql/romanian -#usr/share/mysql/romanian/errmsg.sys -#usr/share/mysql/russian -#usr/share/mysql/russian/errmsg.sys -#usr/share/mysql/serbian -#usr/share/mysql/serbian/errmsg.sys -#usr/share/mysql/slovak -#usr/share/mysql/slovak/errmsg.sys -#usr/share/mysql/spanish -#usr/share/mysql/spanish/errmsg.sys -#usr/share/mysql/swedish -#usr/share/mysql/swedish/errmsg.sys -#usr/share/mysql/ukrainian -#usr/share/mysql/ukrainian/errmsg.sys -var/ipfire/backup/addons/includes/mysql -#var/run/mysql diff --git a/config/rootfiles/packages/perl-DBD-mysql b/config/rootfiles/packages/perl-DBD-mysql deleted file mode 100644 index 177b3ee85..000000000 --- a/config/rootfiles/packages/perl-DBD-mysql +++ /dev/null @@ -1,14 +0,0 @@ -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/DBD -usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/DBD/mysql.pm -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql -usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql.pm -usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql/GetInfo.pm -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql/INSTALL.pod -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql/.packlist -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql/mysql.bs -usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql/mysql.so -#usr/share/man/man3/Bundle::DBD::mysql.3 -#usr/share/man/man3/DBD::mysql.3 -#usr/share/man/man3/DBD::mysql::INSTALL.3 diff --git a/config/rootfiles/packages/postfix b/config/rootfiles/packages/postfix index c35f38201..a97b4907e 100644 --- a/config/rootfiles/packages/postfix +++ b/config/rootfiles/packages/postfix @@ -13,9 +13,6 @@ etc/postfix/main.cf.proto #etc/postfix/makedefs.out etc/postfix/master.cf etc/postfix/master.cf.proto -etc/postfix/mysql-canonical.cf -etc/postfix/mysql-mydestination.cf -etc/postfix/mysql-virtual.cf etc/postfix/postfix-files etc/postfix/postfix-files.d etc/postfix/relocated @@ -99,7 +96,6 @@ usr/sbin/sendmail.postfix #usr/share/man/man5/lmdb_table.5 #usr/share/man/man5/master.5 #usr/share/man/man5/memcache_table.5 -#usr/share/man/man5/mysql_table.5 #usr/share/man/man5/nisplus_table.5 #usr/share/man/man5/pcre_table.5 #usr/share/man/man5/pgsql_table.5 diff --git a/lfs/asterisk b/lfs/asterisk index de2d3192e..8b0da1648 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -28,7 +28,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 21 +PAK_VER = 22
DEPS = "jansson libsrtp opus"
@@ -97,9 +97,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # enable additional features (include following sound-tars) cd $(DIR_APP) && make menuselect.makeopts && menuselect/menuselect \ --enable res_srtp \ - --enable app_mysql \ - --enable cdr_mysql \ - --enable res_config_mysql \ --enable EXTRA-SOUNDS-EN-GSM \ --enable MOH-OPSOUND-GSM \ menuselect.makeopts diff --git a/lfs/automake b/lfs/automake index 0b3d9cce8..d18439443 100644 --- a/lfs/automake +++ b/lfs/automake @@ -35,10 +35,8 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Normal build or $(TOOLS_DIR) build. # ifeq "$(ROOT)" "" - PREFIX = /usr TARGET = $(DIR_INFO)/$(THISAPP) else - PREFIX = $(TOOLS_DIR) TARGET = $(DIR_INFO)/$(THISAPP)-tools endif
@@ -81,10 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch - cd $(DIR_APP) && ./configure \ - --prefix=$(PREFIX) \ - --docdir=/usr/share/doc/automake-1.15 - + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/bash b/lfs/bash index 99a293dbb..bb2a38b34 100644 --- a/lfs/bash +++ b/lfs/bash @@ -35,11 +35,11 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - CONFIGURE_OPTIONS = --prefix=/usr --bindir=/bin \ - --with-installed-readline + CONFIGURE_OPTIONS = \ + --bindir=/bin \ + --with-installed-readline else TARGET = $(DIR_INFO)/$(THISAPP)-tools - CONFIGURE_OPTIONS = --prefix=$(TOOLS_DIR) endif
CONFIGURE_OPTIONS += \ @@ -95,7 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-profile-1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-3.2-ssh_source_bash.patch
- cd $(DIR_APP) && ./configure $(CONFIGURE_OPTIONS) + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
diff --git a/lfs/bison b/lfs/bison index 9e539f0a4..65746f59e 100644 --- a/lfs/bison +++ b/lfs/bison @@ -33,10 +33,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(TOOLCHAIN)" "1" TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=$(TOOLS_DIR) else TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr endif
############################################################################### @@ -77,7 +75,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) && ./configure $(EXTRA_CONFIG) + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/capi4k-utils b/lfs/capi4k-utils deleted file mode 100644 index b82c156e0..000000000 --- a/lfs/capi4k-utils +++ /dev/null @@ -1,89 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 = 2005-07-18 - -THISAPP = capi4k-utils-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/capi4k-utils -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = c745759b6b3d64e19763727176648cdf - -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)/capiinit && sed -i -e 's/-O2/$(CFLAGS)/' configure - cd $(DIR_APP)/capiinit && ./configure - cd $(DIR_APP)/capiinit && make $(MAKETUNING) - cd $(DIR_APP)/capiinit && make install - cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux/capi.h>/include <linux/types.h>\n#include <linux/capi.h>/' capidyn.c - cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux/capi.h>/include <linux/types.h>\n#include <linux/capi.h>/' capi20.c - cd $(DIR_APP)/capi20 && sed -i "/include/a #include <stddef.h>" capi20.h - cd $(DIR_APP)/capi20 && sed -i -e 's/-O2/$(CFLAGS)/' configure - cd $(DIR_APP)/capi20 && SED=sed ./configure - cd $(DIR_APP)/capi20 && SED=sed make $(MAKETUNING) - cd $(DIR_APP)/capi20 && make install - cd $(DIR_APP)/capiinfo && sed -i -e 's/-O2/$(CFLAGS)/' configure - cd $(DIR_APP)/capiinfo && ./configure - cd $(DIR_APP)/capiinfo && make $(MAKETUNING) - cd $(DIR_APP)/capiinfo && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/ccache b/lfs/ccache index 8f6a18152..9ed6c311a 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -24,7 +24,7 @@
include Config
-VER = 3.3.4 +VER = 3.4.1
THISAPP = ccache-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -51,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 95ab3c56284129cc2a32460c23069516 +$(DL_FILE)_MD5 = 39492aea565c3e6d5affa633672a93bd
install : $(TARGET)
diff --git a/lfs/coreutils b/lfs/coreutils index 904bd2bdf..26482aa0f 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -35,13 +35,12 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - CONFIGURE_OPTIONS = --prefix=/usr else TARGET = $(DIR_INFO)/$(THISAPP)-tools - CONFIGURE_OPTIONS = --prefix=$(TOOLS_DIR) endif
CONFIGURE_OPTIONS += \ + --prefix=$(PREFIX) \ --enable-largefile \ --disable-rpath \ --enable-install-program=arch \ diff --git a/lfs/diffutils b/lfs/diffutils index 02586d836..d37dff7b2 100644 --- a/lfs/diffutils +++ b/lfs/diffutils @@ -35,14 +35,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET) - EXTRA_MAKE = - EXTRA_INSTALL = endif
############################################################################### @@ -83,8 +77,8 @@ $(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) && ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/findutils b/lfs/findutils index 6b9e0fc74..ebffc2e58 100644 --- a/lfs/findutils +++ b/lfs/findutils @@ -37,13 +37,9 @@ ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/lib/findutils \ --localstatedir=/var/lib/locate --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET) - EXTRA_MAKE = - EXTRA_INSTALL = endif
############################################################################### @@ -85,8 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install ifeq "$(ROOT)" "" mv -v /usr/bin/find /bin sed -i -e 's|BINDIR=/usr/bin|BINDIR=/bin|' /usr/bin/updatedb diff --git a/lfs/flex b/lfs/flex index 8c8c26f95..4037e93e4 100644 --- a/lfs/flex +++ b/lfs/flex @@ -35,15 +35,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = - else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = endif
@@ -87,9 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch cd $(DIR_APP) && HELP2MAN=$(TOOLS_DIR)/bin/true \ - ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + ./configure --prefix=$(PREFIX) --disable-nls + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install ifeq "$(ROOT)" "" ln -sfv libfl.a /usr/lib/libl.a echo "#!/bin/sh" > /usr/bin/lex diff --git a/lfs/gettext b/lfs/gettext index e4eeb7299..b1bc96306 100644 --- a/lfs/gettext +++ b/lfs/gettext @@ -36,13 +36,9 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-shared --disable-nls --build=$(BUILDTARGET) - EXTRA_MAKE = - EXTRA_INSTALL = endif
############################################################################### @@ -85,8 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) ifeq "$(ROOT)" "" cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && make + cd $(DIR_APP) && make install else cd $(DIR_APP)/gettext-tools && ./configure $(EXTRA_CONFIG) cd $(DIR_APP)/gettext-tools && make -C gnulib-lib diff --git a/lfs/grep b/lfs/grep index 3c3d97696..703e2f7c5 100644 --- a/lfs/grep +++ b/lfs/grep @@ -40,7 +40,6 @@ else TARGET = $(DIR_INFO)/$(THISAPP)-tools EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls \ --disable-perl-regexp --without-included-regex - endif
############################################################################### diff --git a/lfs/m4 b/lfs/m4 index 5bb860444..7d624d985 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -35,12 +35,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr - EXTRA_MAKE = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=$(TOOLS_DIR) - EXTRA_MAKE = endif
############################################################################### @@ -81,8 +77,8 @@ $(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) && ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/mISDNuser b/lfs/mISDNuser deleted file mode 100644 index 923696a80..000000000 --- a/lfs/mISDNuser +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team info@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 = 20121008 - -THISAPP = mISDNuser-$(VER) -DL_FILE = $(THISAPP).tar.xz -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 = 86dd2c68ef5b2fdff653f9f635771127 - -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_SRC)/mISDNuser && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_SRC)/mISDNuser && sed -e "s/-Werror//g" -i */Makefile.* - cd $(DIR_SRC)/mISDNuser && make - cd $(DIR_SRC)/mISDNuser && ./configure --prefix=/usr --with-AF_ISDN=34 - cd $(DIR_SRC)/mISDNuser && make MISDNDIR=/usr/src/linux - cd $(DIR_SRC)/mISDNuser && make install MISDNDIR=/usr/src/linux - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/make b/lfs/make index 8d7d37bc5..bee734ba4 100644 --- a/lfs/make +++ b/lfs/make @@ -39,14 +39,8 @@ DEPS = "" # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = endif
ifeq "$(PASS)" "1" @@ -96,8 +90,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/make-4.2.1-glob-build-fix.patch cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/make-4.2.1-glob-SEGV.patch - cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/mysql b/lfs/mysql deleted file mode 100644 index 8c739c26a..000000000 --- a/lfs/mysql +++ /dev/null @@ -1,110 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 = 5.0.96 - -THISAPP = mysql-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = mysql -PAK_VER = 3 - -CFLAGS += -fno-strict-aliasing -CXXFLAGS += -std=gnu++98 - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = bf280949049161aa68cf29e600d9ec79 - -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 \ - --sysconfdir=/etc \ - --libexecdir=/usr/sbin \ - --localstatedir=/srv/mysql \ - --enable-thread-safe-client \ - --enable-assembler \ - --enable-local-infile \ - --with-unix-socket-path=/var/run/mysql/mysql.sock \ - --without-debug \ - --without-bench \ - --without-readline \ - --with-berkeley-db \ - --with-extra-charsets=all - cd $(DIR_APP) && make testdir=/tmp/mysql $(MAKETUNING) - cd $(DIR_APP) && make testdir=/tmp/mysql install - rm -rf /tmp/mysql - cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* . - install -v -m644 $(DIR_SRC)/config/mysql/my.cnf /etc/my.cnf - mkdir -p /srv/mysql - chown mysql.mysql /srv/mysql/ - install -v -m755 -o mysql -g mysql -d /var/run/mysql - install -v -m 644 $(DIR_SRC)/config/backup/includes/mysql \ - /var/ipfire/backup/addons/includes/mysql - - #install initscripts - $(call INSTALL_INITSCRIPT,mysql) - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/ncurses b/lfs/ncurses index 1186b5244..09efd733e 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -35,10 +35,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - PREFIX = /usr else TARGET = $(DIR_INFO)/$(THISAPP)-tools - PREFIX = $(TOOLS_DIR) EXTRA_CONFIG = --build=$(BUILDTARGET) endif
diff --git a/lfs/pam b/lfs/pam index 9c4739c9b..f379c22d6 100644 --- a/lfs/pam +++ b/lfs/pam @@ -81,7 +81,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Install configuration -mkdir -p /etc/pam.d - cp $(DIR_SRC)/config/pam/* /etc/pam.d
@rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/pammysql b/lfs/pammysql deleted file mode 100644 index a9f15bbe7..000000000 --- a/lfs/pammysql +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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.7RC1 - -THISAPP = pam_mysql-0.7RC1 -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 = 6177183d7e98dc12f2e444c9fbd4f13c - -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 --with-pam=/usr --with-pam-mods-dir=/lib/security --with-mysql=/usr --with-openssl=/usr # --with-cyrus-sasl2=/usr - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/patch b/lfs/patch index 065314d51..10b03d43b 100644 --- a/lfs/patch +++ b/lfs/patch @@ -35,14 +35,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr - EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=$(TOOLS_DIR) - EXTRA_MAKE = - EXTRA_INSTALL = endif
############################################################################### @@ -83,8 +77,8 @@ $(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) && ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/perl-DBD-mysql b/lfs/perl-DBD-mysql deleted file mode 100644 index 48105d4ed..000000000 --- a/lfs/perl-DBD-mysql +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team info@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 = 4.010 - -THISAPP = DBD-mysql-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = perl-DBD-mysql -PAK_VER = 2 -DEPS = perl-DBI - - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = a63c9f73afef70b6c80d899424b003e9 - -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) && perl Makefile.PL - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/pkg-config b/lfs/pkg-config index fe2752a0d..3d039ddf2 100644 --- a/lfs/pkg-config +++ b/lfs/pkg-config @@ -36,10 +36,8 @@ TARGET = $(DIR_INFO)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - PREFIX = /usr else TARGET = $(DIR_INFO)/$(THISAPP)-tools - PREFIX = $(TOOLS_DIR) endif
############################################################################### @@ -80,12 +78,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(ROOT)" "" -else - mkdir -pv $(TOOLS_DIR)/lib/pkgconfig -endif cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + +ifeq "$(TOOLCHAIN)" "1" + mkdir -pv $(TOOLS_DIR)/lib/pkgconfig +endif + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/postfix b/lfs/postfix index ade8941c3..bd8b75ccc 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 10 +PAK_VER = 13
-DEPS = "amavisd mysql" +DEPS = ""
CCARGS = `getconf LFS_CFLAGS` \ -DDEF_DAEMON_DIR="'"/usr/lib/postfix"'" \ @@ -50,10 +50,6 @@ AUXLIBS += -lldap -llber CCARGS += -DHAS_PCRE -I/usr/include/pcre AUXLIBS += -lpcre
-# MySQL -CCARGS += -DHAS_MYSQL -I/usr/include/mysql -AUXLIBS += -L/usr/lib/mysql -lmysqlclient -lm - # SASL CCARGS += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl AUXLIBS += -L/usr/lib/sasl2 -lsasl2 @@ -109,8 +105,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && sh postfix-install -non-interactive ## Install configuration rm -vf /etc/postfix/main.cf.default - cp -vf $(DIR_CONF)/postfix/* /etc/postfix - mv -vf /etc/postfix/aliases /etc/aliases mkdir -p /var/lib/postfix chown postfix.root /var/lib/postfix
diff --git a/lfs/tar b/lfs/tar index 2cca09935..6a949a003 100644 --- a/lfs/tar +++ b/lfs/tar @@ -37,13 +37,9 @@ ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr --bindir=/bin \ --libexecdir=/usr/sbin --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = endif
############################################################################### @@ -85,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) FORCE_UNSAFE_CONFIGURE=1 - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/tcl b/lfs/tcl index fb464dca3..73c92cc81 100644 --- a/lfs/tcl +++ b/lfs/tcl @@ -75,11 +75,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifneq "$(ROOT)" "" - cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR) -else - cd $(DIR_APP)/unix && ./configure --prefix=/usr -endif + cd $(DIR_APP)/unix && ./configure --prefix=$(PREFIX) cd $(DIR_APP)/unix && make $(MAKETUNING) cd $(DIR_APP)/unix && make install ifneq "$(ROOT)" "" diff --git a/lfs/tcpwrapper b/lfs/tcpwrapper deleted file mode 100644 index 464022978..000000000 --- a/lfs/tcpwrapper +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 = 7.6 - -THISAPP = tcp_wrappers_$(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 = e6fa25f71226d090f34de3f6b122fb5a - -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 -Np1 -i /usr/src/src/patches/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch - cd $(DIR_APP) && sed -i -e "s,^extern char *malloc();,/* & */," scaffold.c - cd $(DIR_APP) && make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/texinfo b/lfs/texinfo index 892715644..535612c44 100644 --- a/lfs/texinfo +++ b/lfs/texinfo @@ -35,10 +35,8 @@ DIR_APP = $(DIR_SRC)/texinfo-6.3 # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG = --prefix=/usr else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=$(TOOLS_DIR) endif
############################################################################### @@ -79,7 +77,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) && ./configure $(EXTRA_CONFIG) --disable-nls + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/xz b/lfs/xz index 219c160b9..f8940ab4e 100644 --- a/lfs/xz +++ b/lfs/xz @@ -32,10 +32,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(ROOT)" "" - PREFIX = /usr TARGET = $(DIR_INFO)/$(THISAPP) else - PREFIX = $(TOOLS_DIR) TARGET = $(DIR_INFO)/$(THISAPP)-tools endif
diff --git a/lfs/zlib b/lfs/zlib index d0607513e..25c587aac 100644 --- a/lfs/zlib +++ b/lfs/zlib @@ -71,15 +71,17 @@ $(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) && ./configure --prefix=/usr --shared + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --shared cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
+ifneq "$(TOOLCHAIN)" "1" mv -v /usr/lib/libz.so.$(VER) /lib/libz.so.$(VER) ln -svf libz.so.$(VER) /lib/libz.so.1 ln -svf libz.so.$(VER) /lib/libz.so rm -vf /usr/lib/libz.so.1 rm -vf /usr/lib/libz.so +endif
@rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4fa48f20b..6b55f8e90 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="118" # Core Level (Filename) +CORE="119" # Core Level (Filename) PAKFIRE_CORE="118" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan @@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=20180210 +TOOLCHAINVER=20180212
############################################################################### # @@ -928,6 +928,7 @@ buildtoolchain() { lfsmake1 gcc PASS=L lfsmake1 binutils PASS=2 lfsmake1 gcc PASS=2 + lfsmake1 zlib lfsmake1 ccache PASS=2 lfsmake1 tcl lfsmake1 expect @@ -1174,7 +1175,6 @@ buildipfire() { lfsmake2 libxml2 lfsmake2 libxslt lfsmake2 BerkeleyDB - lfsmake2 mysql lfsmake2 cyrus-sasl lfsmake2 openldap lfsmake2 apache2 @@ -1210,8 +1210,6 @@ buildipfire() { lfsmake2 ipaddr lfsmake2 iputils lfsmake2 l7-protocols - lfsmake2 mISDNuser - lfsmake2 capi4k-utils lfsmake2 hwdata lfsmake2 logrotate lfsmake2 logwatch @@ -1284,7 +1282,6 @@ buildipfire() { lfsmake2 lz4 lfsmake2 lzo lfsmake2 openvpn - lfsmake2 pammysql lfsmake2 mpage lfsmake2 dbus lfsmake2 intltool @@ -1334,7 +1331,6 @@ buildipfire() { lfsmake2 cmake lfsmake2 gnump3d lfsmake2 rsync - lfsmake2 tcpwrapper lfsmake2 libtirpc lfsmake2 rpcbind lfsmake2 nfs @@ -1416,7 +1412,6 @@ buildipfire() { lfsmake2 vdradmin lfsmake2 miau lfsmake2 perl-DBI - lfsmake2 perl-DBD-mysql lfsmake2 perl-DBD-SQLite lfsmake2 perl-File-ReadBackwards lfsmake2 openvmtools diff --git a/src/initscripts/packages/mysql b/src/initscripts/packages/mysql deleted file mode 100644 index 994e3c220..000000000 --- a/src/initscripts/packages/mysql +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -# Begin $rc_base/init.d/mysql - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org - -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ - -. /etc/sysconfig/rc -. $rc_functions - -PIDFILE=/srv/mysql/`/bin/hostname`.pid -KILLDELAY=20 - -case "$1" in - start) - boot_mesg -n "Starting MySQL daemon..." - failure=0 - if [ -f "$PIDFILE" ] - then - if /bin/ps p `cat $PIDFILE` | grep mysqld >/dev/null - then - boot_mesg "mysqld already running!" ${WARNING} - echo_warning - exit 0 - else - rm -f "$PIDFILE" - if [ -f "$PIDFILE" ] - then - failure=1 - fi - fi - fi - if [ "$failure" = "1" ] - then - echo "" - echo_failure - else - echo "" - /usr/bin/mysqld_safe --user=mysql 2>&1 >/dev/null & - evaluate_retval - fi - ;; - - stop) - boot_mesg -n "Stopping MySQL daemon..." - if [ -e "$PIDFILE" ] - then - echo "" - killproc -p ${PIDFILE} /usr/bin/mysqld_safe - else - boot_mesg "mysqld not running!" ${WARNING} - echo_warning - if [ -e "$PIDFILE" ] - then - rm -f $PIDFILE - fi - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc /usr/sbin/mysqld - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/mysql diff --git a/src/initscripts/system/cleanfs b/src/initscripts/system/cleanfs index 2d5778df9..28bafd2a1 100644 --- a/src/initscripts/system/cleanfs +++ b/src/initscripts/system/cleanfs @@ -97,10 +97,6 @@ case "${1}" in if [ ! -e /var/run/dbus ]; then mkdir -p /var/run/dbus fi - if [ ! -e /var/run/mysql ]; then - mkdir -p /var/run/mysql - chown mysql:mysql /var/run/mysql - fi if [ ! -e /var/run/saslauthd ]; then mkdir -p /var/run/saslauthd fi diff --git a/src/initscripts/system/mISDN b/src/initscripts/system/mISDN deleted file mode 100644 index 49f00b020..000000000 --- a/src/initscripts/system/mISDN +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/mISDN -# -# Description : Start mISDN v2 -# -# Authors : Arne Fitzenreiter - arne_f@ipfire.org -# -# Version : 01.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - - boot_mesg "Starting mISDNv2 ... " - - # load mISDN modules - for module in mISDN_core hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc; do - modprobe $module > /dev/null 2>&1; - done - - modprobe mISDN_dsp - modprobe mISDN_dsp_oslec - if [ ${?} = 0 ]; then - echo_ok; - else - echo_failure; - fi - exit 0; - ;; - - stop) - - boot_mesg "Stopping mISDNv2 ... " - - # unload mISDN hardware modules - for module in mISDN_dsp_oslec mISDN_dsp hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc mISDNipac mISDNisar; do - rmmod $module > /dev/null 2>&1; - done - - rmmod mISDN_core > /dev/null 2>&1 - echo_ok; - exit 0; - ;; - - config) - boot_mesg "mISDNv2 - config not needed!" - exit 0; - ;; - - scan) - boot_mesg "mISDNv2 - scan not supported!" - exit 0; - ;; - - *) - echo "Usage: ${0} {start}{stop}" - exit 1 - ;; -esac - -# End $rc_base/init.d/mISDN diff --git a/src/paks/mysql/install.sh b/src/paks/mysql/install.sh deleted file mode 100644 index 1653c9abf..000000000 --- a/src/paks/mysql/install.sh +++ /dev/null @@ -1,50 +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@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh - -extract_files - -ln -svf ../init.d/mysql /etc/rc.d/rc0.d/K26mysql -ln -svf ../init.d/mysql /etc/rc.d/rc3.d/S34mysql -ln -svf ../init.d/mysql /etc/rc.d/rc6.d/K26mysql - -# Initialise database -mysql_install_db --user=mysql - -restore_backup "${NAME}" - -start_service "${NAME}" - -COUNTER=0 -while [ "$COUNTER" -lt "10" ]; do - [ -e "/var/run/mysql/mysql.sock" ] && break - echo "MySQL server is still not running. Waiting 5 seconds." - sleep 5 - COUNTER=$(($COUNTER + 1)) -done - -[ -e "/var/run/mysql/mysql.sock" ] || (echo "MySQL still noch running... Exiting."; \ - exit 1) - -mysqladmin -u root --password='' password 'mysqlfire' diff --git a/src/paks/mysql/uninstall.sh b/src/paks/mysql/uninstall.sh deleted file mode 100644 index a312b2e18..000000000 --- a/src/paks/mysql/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@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh - -# Stop the mysql service -stop_service "${NAME}" - -# Make backup -make_backup "${NAME}" - -remove_files - -# Remove start links. -rm -rvf /etc/rc.d/rc*.d/*mysql diff --git a/src/setup/main.c b/src/setup/main.c index 33f4d2142..adb98a231 100644 --- a/src/setup/main.c +++ b/src/setup/main.c @@ -25,7 +25,7 @@ struct knic knics[20] = { { "" , "" , "" , "" } }; int main(int argc, char *argv[]) { int choice; - char *sections[11]; /* need to fill this out AFTER knowning lang */ + char *sections[8]; /* need to fill this out AFTER knowning lang */ int rc; struct keyvalue *kv; char lang[STRING_SIZE] = "en_US.utf8"; @@ -69,10 +69,9 @@ int main(int argc, char *argv[]) sections[2] = _("Hostname"); sections[3] = _("Domain name"); sections[4] = _("Networking"); - sections[5] = _("ISDN"); - sections[6] = _("'root' password"); - sections[7] = _("'admin' password"); - sections[8] = NULL; + sections[5] = _("'root' password"); + sections[6] = _("'admin' password"); + sections[7] = NULL;
newtInit(); newtCls(); @@ -124,14 +123,10 @@ int main(int argc, char *argv[]) break; case 5: - handleisdn(); - break; - - case 6: handlerootpassword(); break; - case 7: + case 6: handleadminpassword(); break; @@ -154,8 +149,6 @@ int main(int argc, char *argv[]) goto EXIT; if (!(handleadminpassword())) goto EXIT; - if (!(handleisdn())) - goto EXIT; if (!(handlenetworking())) goto EXIT; if (!(handledhcp())) diff --git a/src/setup/misc.c b/src/setup/misc.c index 3b258e0f1..a31b1d8a8 100644 --- a/src/setup/misc.c +++ b/src/setup/misc.c @@ -139,13 +139,3 @@ int writehostsfiles(void) return 1; } - -int handleisdn(void) -{ - char command[STRING_SIZE]; - sprintf(command, "/etc/rc.d/init.d/mISDN config"); - if (runcommandwithstatus(command, _("ISDN"), _("Scanning and configuring ISDN devices."), NULL)) - errorbox(_("Unable to scan for ISDN devices.")); - // Need to write some lines that count the cards and say the names... - return 1; -} diff --git a/src/setup/setup.h b/src/setup/setup.h index a368b78ae..e44bb1c7a 100644 --- a/src/setup/setup.h +++ b/src/setup/setup.h @@ -32,7 +32,6 @@ int handleadminpassword(void);
/* misc.c */ int writehostsfiles(void); -int handleisdn(void);
/* keymap.c */ int handlekeymap(void);
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org