Development March 2016

development@lists.ipfire.org

15 participants
141 discussions

Introducing DDNS
by Michael Tremer 21 Jun '16

21 Jun '16

Hello, this is a post to update you all about the recent developments regarding the support for the various upcoming dynamic DNS providers. Rationale Some of the major dynamic DNS providers stopped their free services or made them unusable so that people started searching for alternatives. In IPFire 2, a script called setddns.pl [1] is responsible for updating the dynamic DNS records. This script has grown over the last couple of months and if you have looked into it you will have noticed that it has become from ugly to almost un-maintainable. The decision that we don't want to take this mess with us into the next generation of IPFire was already made many years ago. DDNS A project called ddns was started which is a pure Python client that is much more flexible, cleanly rewritten and easily extensible. It is cross-platform, cross-distribution and does not need any third-party python modules. The basics already written years ago, Stefan Schantl and I worked on making this ready for IPFire 2 and added all the providers that are currently supported by setddns.pl and ez-ipupdate. The source for the new DDNS tool can be found over here: http://git.ipfire.org/?p=ddns.git;a=summary or on GitHub https://github.com/ipfire/ddns were you can send us pull requests for supporting new providers and so on. Bug reports go to the usual place: https://bugzilla.ipfire.org/describecomponents.cgi?product=DDNS%20Updater There is no fixed release schedule for this, but we are pretty sure that this won't take long until DDNS arrives in IPFire 2. That means that we won't take any patches for the setddns.pl script that add support for new providers any more. We appreciate any contribution and as always hope to get some feedback back from the community! Best, -Michael [1] http://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/scripts/setddns.pl;h=5…

6 18

[PATCH] shadow: update to 4.2.1 v2
by Marcel Lorenz 17 Jun '16

17 Jun '16

This is version 2 of the patch. The first is deprecated. I forgot to add the last rootfile change to my first patch. The build of the iso fails with the first. (/bin/groups not found) The "groups" from the coreutils package is used (/usr/bin/groups) Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/common/shadow | 98 ++--- lfs/shadow | 23 +- .../shadow-4.2.1-SHA512_password_hashing.patch | 38 ++ ...dow-4.2.1-suppress_installation_of_groups.patch | 446 +++++++++++++++++++++ 4 files changed, 546 insertions(+), 59 deletions(-) create mode 100644 src/patches/shadow-4.2.1-SHA512_password_hashing.patch create mode 100644 src/patches/shadow-4.2.1-suppress_installation_of_groups.patch diff --git a/config/rootfiles/common/shadow b/config/rootfiles/common/shadow index ec9054e..0b0c83f 100644 --- a/config/rootfiles/common/shadow +++ b/config/rootfiles/common/shadow @@ -1,17 +1,16 @@ -bin/groups bin/login bin/passwd bin/su #etc/.pwd.lock #etc/default +#etc/default/useradd etc/limits etc/login.access etc/login.defs #etc/passwd- etc/shadow #etc/shadow- -lib/libshadow.so.0 -lib/libshadow.so.0.0.0 +sbin/nologin #usr/bin/chage #usr/bin/chfn #usr/bin/chsh @@ -19,64 +18,22 @@ lib/libshadow.so.0.0.0 #usr/bin/faillog #usr/bin/gpasswd #usr/bin/lastlog +#usr/bin/newgidmap #usr/bin/newgrp +#usr/bin/newuidmap #usr/bin/sg -#usr/lib/libshadow.a -#usr/lib/libshadow.la #usr/lib/libshadow.so -#usr/man/man1/chage.1 -#usr/man/man1/chfn.1 -#usr/man/man1/chsh.1 -#usr/man/man1/expiry.1 -#usr/man/man1/gpasswd.1 -#usr/man/man1/login.1 -#usr/man/man1/newgrp.1 -#usr/man/man1/passwd.1 -#usr/man/man1/sg.1 -#usr/man/man1/su.1 -#usr/man/man3/getspnam.3 -#usr/man/man3/shadow.3 -#usr/man/man5/faillog.5 -#usr/man/man5/gshadow.5 -#usr/man/man5/limits.5 -#usr/man/man5/login.access.5 -#usr/man/man5/login.defs.5 -#usr/man/man5/passwd.5 -#usr/man/man5/porttime.5 -#usr/man/man5/shadow.5 -#usr/man/man5/suauth.5 -#usr/man/man8 -#usr/man/man8/chpasswd.8 -#usr/man/man8/faillog.8 -#usr/man/man8/groupadd.8 -#usr/man/man8/groupdel.8 -#usr/man/man8/groupmod.8 -#usr/man/man8/grpck.8 -#usr/man/man8/grpconv.8 -#usr/man/man8/grpunconv.8 -#usr/man/man8/lastlog.8 -#usr/man/man8/logoutd.8 -#usr/man/man8/newusers.8 -#usr/man/man8/nologin.8 -#usr/man/man8/pwck.8 -#usr/man/man8/pwconv.8 -#usr/man/man8/pwunconv.8 -#usr/man/man8/useradd.8 -#usr/man/man8/userdel.8 -#usr/man/man8/usermod.8 -#usr/man/man8/vigr.8 -#usr/man/man8/vipw.8 #usr/sbin/chgpasswd usr/sbin/chpasswd usr/sbin/groupadd usr/sbin/groupdel +usr/sbin/groupmems usr/sbin/groupmod #usr/sbin/grpck usr/sbin/grpconv #usr/sbin/grpunconv #usr/sbin/logoutd #usr/sbin/newusers -#usr/sbin/nologin #usr/sbin/pwck usr/sbin/pwconv #usr/sbin/pwunconv @@ -85,3 +42,48 @@ usr/sbin/userdel usr/sbin/usermod #usr/sbin/vigr #usr/sbin/vipw +#usr/share/man/man1/chage.1 +#usr/share/man/man1/chfn.1 +#usr/share/man/man1/chsh.1 +#usr/share/man/man1/expiry.1 +#usr/share/man/man1/gpasswd.1 +#usr/share/man/man1/login.1 +#usr/share/man/man1/newgidmap.1 +#usr/share/man/man1/newgrp.1 +#usr/share/man/man1/newuidmap.1 +#usr/share/man/man1/passwd.1 +#usr/share/man/man1/sg.1 +#usr/share/man/man1/su.1 +#usr/share/man/man3/shadow.3 +#usr/share/man/man5/faillog.5 +#usr/share/man/man5/gshadow.5 +#usr/share/man/man5/limits.5 +#usr/share/man/man5/login.access.5 +#usr/share/man/man5/login.defs.5 +#usr/share/man/man5/porttime.5 +#usr/share/man/man5/shadow.5 +#usr/share/man/man5/suauth.5 +#usr/share/man/man5/subgid.5 +#usr/share/man/man5/subuid.5 +#usr/share/man/man8/chgpasswd.8 +#usr/share/man/man8/chpasswd.8 +#usr/share/man/man8/faillog.8 +#usr/share/man/man8/groupadd.8 +#usr/share/man/man8/groupdel.8 +#usr/share/man/man8/groupmems.8 +#usr/share/man/man8/groupmod.8 +#usr/share/man/man8/grpck.8 +#usr/share/man/man8/grpconv.8 +#usr/share/man/man8/grpunconv.8 +#usr/share/man/man8/lastlog.8 +#usr/share/man/man8/logoutd.8 +#usr/share/man/man8/newusers.8 +#usr/share/man/man8/nologin.8 +#usr/share/man/man8/pwck.8 +#usr/share/man/man8/pwconv.8 +#usr/share/man/man8/pwunconv.8 +#usr/share/man/man8/useradd.8 +#usr/share/man/man8/userdel.8 +#usr/share/man/man8/usermod.8 +#usr/share/man/man8/vigr.8 +#usr/share/man/man8/vipw.8 diff --git a/lfs/shadow b/lfs/shadow index f281431..b4777b9 100644 --- a/lfs/shadow +++ b/lfs/shadow @@ -24,10 +24,10 @@ include Config -VER = 4.0.15 +VER = 4.2.1 THISAPP = shadow-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a0452fa989f8ba45023cc5a08136568e +$(DL_FILE)_MD5 = 2bfafe7d4962682d31b5eba65dba4fc8 install : $(TARGET) @@ -69,11 +69,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --libdir=/lib --enable-shared --without-selinux --disable-nls - cd $(DIR_APP) && sed -i 's/groups$(EXEEXT) //' src/Makefile - cd $(DIR_APP) && find man -name Makefile -exec sed -i '/groups/d' {} \; - cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-SHA512_password_hashing.patch + cd $(DIR_APP) && ./configure --libdir=/lib \ + --sysconfdir=/etc \ + --enable-shared \ + --without-selinux \ + --disable-nls \ + --with-group-name-max-length=32 cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && cp -v etc/{limits,login.access} /etc @@ -81,10 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's@/var/spool/mail@/var/mail@' \ etc/login.defs > /etc/login.defs mv -v /usr/bin/passwd /bin - mv -v /lib/libshadow.*a /usr/lib - rm -v /lib/libshadow.so ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so - mkdir -v /etc/default touch /etc/shadow chmod 600 /etc/shadow pwconv diff --git a/src/patches/shadow-4.2.1-SHA512_password_hashing.patch b/src/patches/shadow-4.2.1-SHA512_password_hashing.patch new file mode 100644 index 0000000..7fc5bc9 --- /dev/null +++ b/src/patches/shadow-4.2.1-SHA512_password_hashing.patch @@ -0,0 +1,38 @@ +diff -crB shadow-4.2.1-a/etc/login.defs shadow-4.2.1-b/etc/login.defs +*** shadow-4.2.1-a/etc/login.defs 2014-05-09 10:20:28.000000000 +0000 +--- shadow-4.2.1-b/etc/login.defs 2016-03-13 10:51:09.680171239 +0000 +*************** +*** 118,124 **** + # Directory where mailboxes reside, _or_ name of file, relative to the + # home directory. If you _do_ define both, MAIL_DIR takes precedence. + # +! MAIL_DIR /var/spool/mail + #MAIL_FILE .mail + + # +--- 118,124 ---- + # Directory where mailboxes reside, _or_ name of file, relative to the + # home directory. If you _do_ define both, MAIL_DIR takes precedence. + # +! MAIL_DIR /var/mail + #MAIL_FILE .mail + + # +*************** +*** 317,323 **** + # Note: If you use PAM, it is recommended to use a value consistent with + # the PAM modules configuration. + # +! #ENCRYPT_METHOD DES + + # + # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. +--- 317,323 ---- + # Note: If you use PAM, it is recommended to use a value consistent with + # the PAM modules configuration. + # +! ENCRYPT_METHOD SHA512 + + # + # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. +Only in shadow-4.2.1-b: SHA512_password_hashing.patch diff --git a/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch b/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch new file mode 100644 index 0000000..f9f09c4 --- /dev/null +++ b/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch @@ -0,0 +1,446 @@ +diff -crB shadow-4.2.1-a/man/cs/Makefile.in shadow-4.2.1-b/man/cs/Makefile.in +*** shadow-4.2.1-a/man/cs/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/cs/Makefile.in 2016-03-13 10:47:55.924166976 +0000 +*************** +*** 300,311 **** + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man1/groups.1 \ + man8/grpck.8 \ + man5/gshadow.5 \ + man8/lastlog.8 \ + man8/nologin.8 \ +! man5/passwd.5 \ + man5/shadow.5 \ + man1/su.1 \ + man8/vipw.8 +--- 300,311 ---- + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man1/ \ + man8/grpck.8 \ + man5/gshadow.5 \ + man8/lastlog.8 \ + man8/nologin.8 \ +! man5/ \ + man5/shadow.5 \ + man1/su.1 \ + man8/vipw.8 +diff -crB shadow-4.2.1-a/man/da/Makefile.in shadow-4.2.1-b/man/da/Makefile.in +*** shadow-4.2.1-a/man/da/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/da/Makefile.in 2016-03-13 10:47:55.928166977 +0000 +*************** +*** 298,304 **** + top_srcdir = @top_srcdir@ + + # 2012.01.28 - activate manpages with more than 50% translated messages +! man_MANS = man1/chfn.1 man8/groupdel.8 man1/groups.1 man5/gshadow.5 \ + man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \ + man8/vigr.8 man8/vipw.8 $(am__append_1) + man_nopam = +--- 298,304 ---- + top_srcdir = @top_srcdir@ + + # 2012.01.28 - activate manpages with more than 50% translated messages +! man_MANS = man1/chfn.1 man8/groupdel.8 man1/ man5/gshadow.5 \ + man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \ + man8/vigr.8 man8/vipw.8 $(am__append_1) + man_nopam = +diff -crB shadow-4.2.1-a/man/de/Makefile.in shadow-4.2.1-b/man/de/Makefile.in +*** shadow-4.2.1-a/man/de/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/de/Makefile.in 2016-03-13 10:47:55.916166976 +0000 +*************** +*** 299,309 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 299,309 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/es/Makefile.in shadow-4.2.1-b/man/es/Makefile.in +*** shadow-4.2.1-a/man/es/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/es/Makefile.in 2016-03-13 10:47:55.872166975 +0000 +*************** +*** 266,272 **** + # man1/login.1 \ + # man1/newgrp.1 \ + # man1/passwd.1 \ +! # man5/passwd.5 \ + # man1/su.1 \ + # man8/vigr.8 \ + # man8/vipw.8 +--- 266,272 ---- + # man1/login.1 \ + # man1/newgrp.1 \ + # man1/passwd.1 \ +! # man5/ \ + # man1/su.1 \ + # man8/vigr.8 \ + # man8/vipw.8 +diff -crB shadow-4.2.1-a/man/fr/Makefile.in shadow-4.2.1-b/man/fr/Makefile.in +*** shadow-4.2.1-a/man/fr/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/fr/Makefile.in 2016-03-13 10:47:55.984166978 +0000 +*************** +*** 301,311 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 301,311 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/hu/Makefile.in shadow-4.2.1-b/man/hu/Makefile.in +*** shadow-4.2.1-a/man/hu/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/hu/Makefile.in 2016-03-13 10:47:55.972166978 +0000 +*************** +*** 295,306 **** + man_MANS = \ + man1/chsh.1 \ + man1/gpasswd.1 \ +! man1/groups.1 \ + man8/lastlog.8 \ + man1/login.1 \ + man1/newgrp.1 \ + man1/passwd.1 \ +! man5/passwd.5 \ + man1/sg.1 \ + man1/su.1 + +--- 295,306 ---- + man_MANS = \ + man1/chsh.1 \ + man1/gpasswd.1 \ +! man1/ \ + man8/lastlog.8 \ + man1/login.1 \ + man1/newgrp.1 \ + man1/passwd.1 \ +! man5/ \ + man1/sg.1 \ + man1/su.1 + +diff -crB shadow-4.2.1-a/man/it/Makefile.in shadow-4.2.1-b/man/it/Makefile.in +*** shadow-4.2.1-a/man/it/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/it/Makefile.in 2016-03-13 10:47:55.896166976 +0000 +*************** +*** 299,309 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 299,309 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/ja/Makefile.in shadow-4.2.1-b/man/ja/Makefile.in +*** shadow-4.2.1-a/man/ja/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/ja/Makefile.in 2016-03-13 10:47:55.932166977 +0000 +*************** +*** 296,305 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \ + man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \ +! man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/groups.1 \ + man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \ + man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \ + man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \ + man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) +--- 296,305 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \ + man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \ +! man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/ \ + man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man1/passwd.1 man5/ man8/pwck.8 \ + man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \ + man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \ + man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) +diff -crB shadow-4.2.1-a/man/ko/Makefile.in shadow-4.2.1-b/man/ko/Makefile.in +*** shadow-4.2.1-a/man/ko/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/ko/Makefile.in 2016-03-13 10:47:55.940166977 +0000 +*************** +*** 295,303 **** + man_MANS = \ + man1/chfn.1 \ + man1/chsh.1 \ +! man1/groups.1 \ + man1/login.1 \ +! man5/passwd.5 \ + man1/su.1 \ + man8/vigr.8 \ + man8/vipw.8 +--- 295,303 ---- + man_MANS = \ + man1/chfn.1 \ + man1/chsh.1 \ +! man1/ \ + man1/login.1 \ +! man5/ \ + man1/su.1 \ + man8/vigr.8 \ + man8/vipw.8 +diff -crB shadow-4.2.1-a/man/Makefile.in shadow-4.2.1-b/man/Makefile.in +*** shadow-4.2.1-a/man/Makefile.in 2014-05-09 16:49:46.000000000 +0000 +--- shadow-4.2.1-b/man/Makefile.in 2016-03-13 10:47:55.880166976 +0000 +*************** +*** 365,375 **** + @USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 365,375 ---- + @USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/pl/Makefile.in shadow-4.2.1-b/man/pl/Makefile.in +*** shadow-4.2.1-a/man/pl/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/pl/Makefile.in 2016-03-13 10:47:55.912166976 +0000 +*************** +*** 300,307 **** + + # 2012.01.28 - activate manpages with more than 50% translated messages + man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \ +! man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \ + man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ + man8/vipw.8 $(am__append_1) +--- 300,307 ---- + + # 2012.01.28 - activate manpages with more than 50% translated messages + man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \ +! man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \ + man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ + man8/vipw.8 $(am__append_1) +diff -crB shadow-4.2.1-a/man/pt_BR/Makefile.in shadow-4.2.1-b/man/pt_BR/Makefile.in +*** shadow-4.2.1-a/man/pt_BR/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/pt_BR/Makefile.in 2016-03-13 10:47:55.904166976 +0000 +*************** +*** 297,303 **** + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man5/passwd.5 \ + man5/shadow.5 + + EXTRA_DIST = $(man_MANS) +--- 297,303 ---- + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man5/ \ + man5/shadow.5 + + EXTRA_DIST = $(man_MANS) +diff -crB shadow-4.2.1-a/man/ru/Makefile.in shadow-4.2.1-b/man/ru/Makefile.in +*** shadow-4.2.1-a/man/ru/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/ru/Makefile.in 2016-03-13 10:47:55.944166977 +0000 +*************** +*** 299,309 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 299,309 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/sv/Makefile.in shadow-4.2.1-b/man/sv/Makefile.in +*** shadow-4.2.1-a/man/sv/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/sv/Makefile.in 2016-03-13 10:47:55.988166978 +0000 +*************** +*** 300,309 **** + + # 2012.01.28 - activate manpages with more than 50% translated messages + man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \ +! man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \ +! man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \ + man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \ + man8/vigr.8 man8/vipw.8 $(am__append_1) + man_nopam = \ +--- 300,309 ---- + + # 2012.01.28 - activate manpages with more than 50% translated messages + man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \ +! man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \ +! man8/nologin.8 man1/passwd.1 man5/ man8/pwck.8 \ + man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \ + man8/vigr.8 man8/vipw.8 $(am__append_1) + man_nopam = \ +diff -crB shadow-4.2.1-a/man/tr/Makefile.in shadow-4.2.1-b/man/tr/Makefile.in +*** shadow-4.2.1-a/man/tr/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/tr/Makefile.in 2016-03-13 10:47:55.964166977 +0000 +*************** +*** 300,306 **** + man8/groupmod.8 \ + man1/login.1 \ + man1/passwd.1 \ +! man5/passwd.5 \ + man5/shadow.5 \ + man1/su.1 \ + man8/useradd.8 \ +--- 300,306 ---- + man8/groupmod.8 \ + man1/login.1 \ + man1/passwd.1 \ +! man5/ \ + man5/shadow.5 \ + man1/su.1 \ + man8/useradd.8 \ +diff -crB shadow-4.2.1-a/man/zh_CN/Makefile.in shadow-4.2.1-b/man/zh_CN/Makefile.in +*** shadow-4.2.1-a/man/zh_CN/Makefile.in 2014-05-09 16:49:47.000000000 +0000 +--- shadow-4.2.1-b/man/zh_CN/Makefile.in 2016-03-13 10:47:55.952166977 +0000 +*************** +*** 299,309 **** + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +--- 299,309 ---- + top_srcdir = @top_srcdir@ + man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ + man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \ +! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \ +! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \ + man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \ + man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \ +! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \ + man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ + man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ + man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ +diff -crB shadow-4.2.1-a/man/zh_TW/Makefile.in shadow-4.2.1-b/man/zh_TW/Makefile.in +*** shadow-4.2.1-a/man/zh_TW/Makefile.in 2014-05-09 16:49:48.000000000 +0000 +--- shadow-4.2.1-b/man/zh_TW/Makefile.in 2016-03-13 10:47:55.956166977 +0000 +*************** +*** 302,308 **** + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man5/passwd.5 \ + man1/su.1 \ + man8/useradd.8 \ + man8/userdel.8 \ +--- 302,308 ---- + man8/groupadd.8 \ + man8/groupdel.8 \ + man8/groupmod.8 \ +! man5/ \ + man1/su.1 \ + man8/useradd.8 \ + man8/userdel.8 \ +diff -crB shadow-4.2.1-a/src/Makefile.in shadow-4.2.1-b/src/Makefile.in +*** shadow-4.2.1-a/src/Makefile.in 2014-05-09 16:49:48.000000000 +0000 +--- shadow-4.2.1-b/src/Makefile.in 2016-03-13 10:47:38.824166600 +0000 +*************** +*** 78,84 **** + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +! bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) su$(EXEEXT) + sbin_PROGRAMS = nologin$(EXEEXT) + ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \ + chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \ +--- 78,84 ---- + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +! bin_PROGRAMS = login$(EXEEXT) su$(EXEEXT) + sbin_PROGRAMS = nologin$(EXEEXT) + ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \ + chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \ -- 1.9.1

2 1

[PATCH] mysql: upgraded to MariaDB 10.1.12
by Daniel Weismüller 03 Jun '16

03 Jun '16

It is required to manually run mysql_upgrade after the new package has been installed. Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> --- config/backup/includes/mysql | 1 + config/mysql/my.cnf | 1 - config/rootfiles/common/mysql-libs | 16 +- config/rootfiles/packages/mysql | 525 +++++++++++++++++++++++++++++++++---- lfs/mysql | 68 +++-- make.sh | 6 +- src/initscripts/init.d/mysql | 4 +- src/paks/mysql/update.sh | 4 + 8 files changed, 534 insertions(+), 91 deletions(-) diff --git a/config/backup/includes/mysql b/config/backup/includes/mysql index bcb837c..be6bc5c 100644 --- a/config/backup/includes/mysql +++ b/config/backup/includes/mysql @@ -1,2 +1,3 @@ /etc/my.cnf +/etc/my.cnf.d /srv/mysql diff --git a/config/mysql/my.cnf b/config/mysql/my.cnf index d9b75e8..29a568a 100644 --- a/config/mysql/my.cnf +++ b/config/mysql/my.cnf @@ -11,7 +11,6 @@ bind-address=127.0.0.1 [mysql.server] user=mysql -basedir=/var/lib [mysqld_safe] log-error=/var/log/mysqld.log diff --git a/config/rootfiles/common/mysql-libs b/config/rootfiles/common/mysql-libs index 6eb0384..e3e4bf3 100644 --- a/config/rootfiles/common/mysql-libs +++ b/config/rootfiles/common/mysql-libs @@ -1,10 +1,10 @@ -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/libmysqlclient.so.18 +usr/lib/libmysqlclient.so.18.0.0 +usr/lib/libmysqlclient_r.so.18 +usr/lib/libmysqlclient_r.so.18.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.so.18 +usr/lib/mysql/libmysqlclient.so.18.0.0 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/libmysqlclient_r.so.18 +usr/lib/mysql/libmysqlclient_r.so.18.0.0 diff --git a/config/rootfiles/packages/mysql b/config/rootfiles/packages/mysql index 8f1414a..cb54804 100644 --- a/config/rootfiles/packages/mysql +++ b/config/rootfiles/packages/mysql @@ -1,16 +1,39 @@ -etc/my.cnf etc/rc.d/init.d/mysql +#etc/logrotate.d +etc/logrotate.d/mysql +etc/my.cnf +etc/my.cnf.d +etc/my.cnf.d/client.cnf +etc/my.cnf.d/enable_encryption.preset +etc/my.cnf.d/mysql-clients.cnf +etc/my.cnf.d/server.cnf srv/mysql +#srv/mysql/aria_log.00000001 +#srv/mysql/aria_log_control +#srv/mysql/ib_logfile0 +#srv/mysql/ib_logfile1 +#srv/mysql/ibdata1 #srv/mysql/mysql +#srv/mysql/mysql/column_stats.MYD +#srv/mysql/mysql/column_stats.MYI +#srv/mysql/mysql/column_stats.frm #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/event.MYD +#srv/mysql/mysql/event.MYI +#srv/mysql/mysql/event.frm #srv/mysql/mysql/func.MYD #srv/mysql/mysql/func.MYI #srv/mysql/mysql/func.frm +#srv/mysql/mysql/general_log.CSM +#srv/mysql/mysql/general_log.CSV +#srv/mysql/mysql/general_log.frm +#srv/mysql/mysql/gtid_slave_pos.frm +#srv/mysql/mysql/gtid_slave_pos.ibd #srv/mysql/mysql/help_category.MYD #srv/mysql/mysql/help_category.MYI #srv/mysql/mysql/help_category.frm @@ -26,12 +49,37 @@ srv/mysql #srv/mysql/mysql/host.MYD #srv/mysql/mysql/host.MYI #srv/mysql/mysql/host.frm +#srv/mysql/mysql/index_stats.MYD +#srv/mysql/mysql/index_stats.MYI +#srv/mysql/mysql/index_stats.frm +#srv/mysql/mysql/innodb_index_stats.frm +#srv/mysql/mysql/innodb_index_stats.ibd +#srv/mysql/mysql/innodb_table_stats.frm +#srv/mysql/mysql/innodb_table_stats.ibd +#srv/mysql/mysql/plugin.MYD +#srv/mysql/mysql/plugin.MYI +#srv/mysql/mysql/plugin.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/proxies_priv.MYD +#srv/mysql/mysql/proxies_priv.MYI +#srv/mysql/mysql/proxies_priv.frm +#srv/mysql/mysql/roles_mapping.MYD +#srv/mysql/mysql/roles_mapping.MYI +#srv/mysql/mysql/roles_mapping.frm +#srv/mysql/mysql/servers.MYD +#srv/mysql/mysql/servers.MYI +#srv/mysql/mysql/servers.frm +#srv/mysql/mysql/slow_log.CSM +#srv/mysql/mysql/slow_log.CSV +#srv/mysql/mysql/slow_log.frm +#srv/mysql/mysql/table_stats.MYD +#srv/mysql/mysql/table_stats.MYI +#srv/mysql/mysql/table_stats.frm #srv/mysql/mysql/tables_priv.MYD #srv/mysql/mysql/tables_priv.MYI #srv/mysql/mysql/tables_priv.frm @@ -53,8 +101,14 @@ srv/mysql #srv/mysql/mysql/user.MYD #srv/mysql/mysql/user.MYI #srv/mysql/mysql/user.frm -srv/mysql/test -usr/bin/comp_err +#srv/mysql/performance_schema +#srv/mysql/performance_schema/db.opt +#srv/mysql/test +usr/bin/aria_chk +usr/bin/aria_dump_log +usr/bin/aria_ftdump +usr/bin/aria_pack +usr/bin/aria_read_log usr/bin/innochecksum usr/bin/msql2mysql usr/bin/my_print_defaults @@ -63,20 +117,16 @@ 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_plugin 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 @@ -91,41 +141,347 @@ usr/bin/mysqldumpslow usr/bin/mysqlhotcopy usr/bin/mysqlimport usr/bin/mysqlshow +usr/bin/mysqlslap usr/bin/mysqltest -usr/bin/mysqltestmanager -usr/bin/mysqltestmanager-pwgen -usr/bin/mysqltestmanagerc +#usr/bin/mytop usr/bin/perror usr/bin/replace usr/bin/resolve_stack_dump usr/bin/resolveip +usr/bin/wsrep_sst_common +usr/bin/wsrep_sst_mysqldump +usr/bin/wsrep_sst_rsync +usr/bin/wsrep_sst_xtrabackup +usr/bin/wsrep_sst_xtrabackup-v2 +#usr/data +#usr/data/test +#usr/data/test/db.opt #usr/include/mysql +#usr/include/mysql/auth_dialog_client.h +#usr/include/mysql/big_endian.h +#usr/include/mysql/byte_order_generic.h +#usr/include/mysql/byte_order_generic_x86.h +#usr/include/mysql/byte_order_generic_x86_64.h +#usr/include/mysql/client_plugin.h #usr/include/mysql/decimal.h #usr/include/mysql/errmsg.h +#usr/include/mysql/handler_ername.h +#usr/include/mysql/handler_state.h #usr/include/mysql/keycache.h +#usr/include/mysql/little_endian.h #usr/include/mysql/m_ctype.h #usr/include/mysql/m_string.h +#usr/include/mysql/ma_dyncol.h #usr/include/mysql/my_alloc.h #usr/include/mysql/my_attribute.h +#usr/include/mysql/my_byteorder.h +#usr/include/mysql/my_compiler.h #usr/include/mysql/my_config.h #usr/include/mysql/my_dbug.h +#usr/include/mysql/my_decimal_limits.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_valgrind.h #usr/include/mysql/my_xml.h #usr/include/mysql/mysql.h #usr/include/mysql/mysql_com.h +#usr/include/mysql/mysql_com_server.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/plugin.h +#usr/include/mysql/plugin_audit.h +#usr/include/mysql/plugin_auth.h +#usr/include/mysql/plugin_auth_common.h +#usr/include/mysql/plugin_encryption.h +#usr/include/mysql/plugin_ftparser.h +#usr/include/mysql/plugin_password_validation.h +#usr/include/mysql/private +#usr/include/mysql/private/atomic +#usr/include/mysql/private/atomic/gcc_builtins.h +#usr/include/mysql/private/atomic/generic-msvc.h +#usr/include/mysql/private/atomic/nolock.h +#usr/include/mysql/private/atomic/solaris.h +#usr/include/mysql/private/atomic/x86-gcc.h +#usr/include/mysql/private/authors.h +#usr/include/mysql/private/base64.h +#usr/include/mysql/private/bounded_queue.h +#usr/include/mysql/private/client_settings.h +#usr/include/mysql/private/compat56.h +#usr/include/mysql/private/config.h +#usr/include/mysql/private/contributors.h +#usr/include/mysql/private/create_options.h +#usr/include/mysql/private/custom_conf.h +#usr/include/mysql/private/datadict.h +#usr/include/mysql/private/debug_sync.h +#usr/include/mysql/private/derror.h +#usr/include/mysql/private/des_key_file.h +#usr/include/mysql/private/discover.h +#usr/include/mysql/private/event_data_objects.h +#usr/include/mysql/private/event_db_repository.h +#usr/include/mysql/private/event_parse_data.h +#usr/include/mysql/private/event_queue.h +#usr/include/mysql/private/event_scheduler.h +#usr/include/mysql/private/events.h +#usr/include/mysql/private/field.h +#usr/include/mysql/private/filesort.h +#usr/include/mysql/private/filesort_utils.h +#usr/include/mysql/private/ft_global.h +#usr/include/mysql/private/gcalc_slicescan.h +#usr/include/mysql/private/gcalc_tools.h +#usr/include/mysql/private/group_by_handler.h +#usr/include/mysql/private/gstream.h +#usr/include/mysql/private/ha_partition.h +#usr/include/mysql/private/handler.h +#usr/include/mysql/private/hash.h +#usr/include/mysql/private/hash_filo.h +#usr/include/mysql/private/heap.h +#usr/include/mysql/private/hostname.h +#usr/include/mysql/private/init.h +#usr/include/mysql/private/innodb_priv.h +#usr/include/mysql/private/item.h +#usr/include/mysql/private/item_cmpfunc.h +#usr/include/mysql/private/item_create.h +#usr/include/mysql/private/item_func.h +#usr/include/mysql/private/item_geofunc.h +#usr/include/mysql/private/item_inetfunc.h +#usr/include/mysql/private/item_row.h +#usr/include/mysql/private/item_strfunc.h +#usr/include/mysql/private/item_subselect.h +#usr/include/mysql/private/item_sum.h +#usr/include/mysql/private/item_timefunc.h +#usr/include/mysql/private/item_xmlfunc.h +#usr/include/mysql/private/key.h +#usr/include/mysql/private/keycaches.h +#usr/include/mysql/private/lex.h +#usr/include/mysql/private/lex_hash.h +#usr/include/mysql/private/lex_symbol.h +#usr/include/mysql/private/lex_token.h +#usr/include/mysql/private/lf.h +#usr/include/mysql/private/lock.h +#usr/include/mysql/private/log.h +#usr/include/mysql/private/log_event.h +#usr/include/mysql/private/log_event_old.h +#usr/include/mysql/private/log_slow.h +#usr/include/mysql/private/maria.h +#usr/include/mysql/private/mdl.h +#usr/include/mysql/private/mem_root_array.h +#usr/include/mysql/private/message.h +#usr/include/mysql/private/multi_range_read.h +#usr/include/mysql/private/my_alarm.h +#usr/include/mysql/private/my_apc.h +#usr/include/mysql/private/my_atomic.h +#usr/include/mysql/private/my_base.h +#usr/include/mysql/private/my_bit.h +#usr/include/mysql/private/my_bitmap.h +#usr/include/mysql/private/my_check_opt.h +#usr/include/mysql/private/my_compare.h +#usr/include/mysql/private/my_context.h +#usr/include/mysql/private/my_cpu.h +#usr/include/mysql/private/my_crypt.h +#usr/include/mysql/private/my_decimal.h +#usr/include/mysql/private/my_default.h +#usr/include/mysql/private/my_handler_errors.h +#usr/include/mysql/private/my_json_writer.h +#usr/include/mysql/private/my_libwrap.h +#usr/include/mysql/private/my_md5.h +#usr/include/mysql/private/my_nosys.h +#usr/include/mysql/private/my_rdtsc.h +#usr/include/mysql/private/my_rnd.h +#usr/include/mysql/private/my_stacktrace.h +#usr/include/mysql/private/my_systemd.h +#usr/include/mysql/private/my_time.h +#usr/include/mysql/private/my_tree.h +#usr/include/mysql/private/my_uctype.h +#usr/include/mysql/private/my_user.h +#usr/include/mysql/private/myisam.h +#usr/include/mysql/private/myisamchk.h +#usr/include/mysql/private/myisammrg.h +#usr/include/mysql/private/myisampack.h +#usr/include/mysql/private/mysql_async.h +#usr/include/mysql/private/mysqld.h +#usr/include/mysql/private/mysqld_default_groups.h +#usr/include/mysql/private/mysqld_suffix.h +#usr/include/mysql/private/mysys_err.h +#usr/include/mysql/private/nt_servc.h +#usr/include/mysql/private/opt_range.h +#usr/include/mysql/private/opt_subselect.h +#usr/include/mysql/private/parse_file.h +#usr/include/mysql/private/partition_element.h +#usr/include/mysql/private/partition_info.h +#usr/include/mysql/private/password.h +#usr/include/mysql/private/probes_mysql.h +#usr/include/mysql/private/probes_mysql_nodtrace.h +#usr/include/mysql/private/procedure.h +#usr/include/mysql/private/protocol.h +#usr/include/mysql/private/queues.h +#usr/include/mysql/private/records.h +#usr/include/mysql/private/repl_failsafe.h +#usr/include/mysql/private/replication.h +#usr/include/mysql/private/rijndael.h +#usr/include/mysql/private/rpl_constants.h +#usr/include/mysql/private/rpl_filter.h +#usr/include/mysql/private/rpl_gtid.h +#usr/include/mysql/private/rpl_handler.h +#usr/include/mysql/private/rpl_injector.h +#usr/include/mysql/private/rpl_mi.h +#usr/include/mysql/private/rpl_parallel.h +#usr/include/mysql/private/rpl_record.h +#usr/include/mysql/private/rpl_record_old.h +#usr/include/mysql/private/rpl_reporting.h +#usr/include/mysql/private/rpl_rli.h +#usr/include/mysql/private/rpl_tblmap.h +#usr/include/mysql/private/rpl_utility.h +#usr/include/mysql/private/scheduler.h +#usr/include/mysql/private/service_versions.h +#usr/include/mysql/private/set_var.h +#usr/include/mysql/private/sha1.h +#usr/include/mysql/private/sha2.h +#usr/include/mysql/private/slave.h +#usr/include/mysql/private/sp.h +#usr/include/mysql/private/sp_cache.h +#usr/include/mysql/private/sp_head.h +#usr/include/mysql/private/sp_pcontext.h +#usr/include/mysql/private/sp_rcontext.h +#usr/include/mysql/private/spatial.h +#usr/include/mysql/private/sql_acl.h +#usr/include/mysql/private/sql_admin.h +#usr/include/mysql/private/sql_alter.h +#usr/include/mysql/private/sql_analyse.h +#usr/include/mysql/private/sql_analyze_stmt.h +#usr/include/mysql/private/sql_array.h +#usr/include/mysql/private/sql_audit.h +#usr/include/mysql/private/sql_base.h +#usr/include/mysql/private/sql_binlog.h +#usr/include/mysql/private/sql_bitmap.h +#usr/include/mysql/private/sql_bootstrap.h +#usr/include/mysql/private/sql_cache.h +#usr/include/mysql/private/sql_callback.h +#usr/include/mysql/private/sql_class.h +#usr/include/mysql/private/sql_cmd.h +#usr/include/mysql/private/sql_connect.h +#usr/include/mysql/private/sql_const.h +#usr/include/mysql/private/sql_crypt.h +#usr/include/mysql/private/sql_cursor.h +#usr/include/mysql/private/sql_db.h +#usr/include/mysql/private/sql_delete.h +#usr/include/mysql/private/sql_derived.h +#usr/include/mysql/private/sql_digest.h +#usr/include/mysql/private/sql_digest_stream.h +#usr/include/mysql/private/sql_do.h +#usr/include/mysql/private/sql_error.h +#usr/include/mysql/private/sql_explain.h +#usr/include/mysql/private/sql_expression_cache.h +#usr/include/mysql/private/sql_get_diagnostics.h +#usr/include/mysql/private/sql_handler.h +#usr/include/mysql/private/sql_help.h +#usr/include/mysql/private/sql_hset.h +#usr/include/mysql/private/sql_insert.h +#usr/include/mysql/private/sql_join_cache.h +#usr/include/mysql/private/sql_lex.h +#usr/include/mysql/private/sql_lifo_buffer.h +#usr/include/mysql/private/sql_list.h +#usr/include/mysql/private/sql_load.h +#usr/include/mysql/private/sql_locale.h +#usr/include/mysql/private/sql_manager.h +#usr/include/mysql/private/sql_parse.h +#usr/include/mysql/private/sql_partition.h +#usr/include/mysql/private/sql_partition_admin.h +#usr/include/mysql/private/sql_plist.h +#usr/include/mysql/private/sql_plugin.h +#usr/include/mysql/private/sql_plugin_compat.h +#usr/include/mysql/private/sql_prepare.h +#usr/include/mysql/private/sql_priv.h +#usr/include/mysql/private/sql_profile.h +#usr/include/mysql/private/sql_reload.h +#usr/include/mysql/private/sql_rename.h +#usr/include/mysql/private/sql_repl.h +#usr/include/mysql/private/sql_select.h +#usr/include/mysql/private/sql_servers.h +#usr/include/mysql/private/sql_show.h +#usr/include/mysql/private/sql_signal.h +#usr/include/mysql/private/sql_sort.h +#usr/include/mysql/private/sql_statistics.h +#usr/include/mysql/private/sql_string.h +#usr/include/mysql/private/sql_table.h +#usr/include/mysql/private/sql_tablespace.h +#usr/include/mysql/private/sql_test.h +#usr/include/mysql/private/sql_time.h +#usr/include/mysql/private/sql_trigger.h +#usr/include/mysql/private/sql_truncate.h +#usr/include/mysql/private/sql_type.h +#usr/include/mysql/private/sql_udf.h +#usr/include/mysql/private/sql_union.h +#usr/include/mysql/private/sql_update.h +#usr/include/mysql/private/sql_view.h +#usr/include/mysql/private/sql_yacc.h +#usr/include/mysql/private/strfunc.h +#usr/include/mysql/private/structs.h +#usr/include/mysql/private/sys_vars_shared.h +#usr/include/mysql/private/t_ctype.h +#usr/include/mysql/private/table.h +#usr/include/mysql/private/table_cache.h +#usr/include/mysql/private/thr_alarm.h +#usr/include/mysql/private/thr_lock.h +#usr/include/mysql/private/thr_malloc.h +#usr/include/mysql/private/thr_timer.h +#usr/include/mysql/private/thread_pool_priv.h +#usr/include/mysql/private/threadpool.h +#usr/include/mysql/private/transaction.h +#usr/include/mysql/private/tzfile.h +#usr/include/mysql/private/tztime.h +#usr/include/mysql/private/unireg.h +#usr/include/mysql/private/violite.h +#usr/include/mysql/private/waiting_threads.h +#usr/include/mysql/private/welcome_copyright_notice.h +#usr/include/mysql/private/winservice.h +#usr/include/mysql/private/wqueue.h +#usr/include/mysql/private/wsrep.h +#usr/include/mysql/private/wsrep_applier.h +#usr/include/mysql/private/wsrep_binlog.h +#usr/include/mysql/private/wsrep_mysqld.h +#usr/include/mysql/private/wsrep_priv.h +#usr/include/mysql/private/wsrep_sst.h +#usr/include/mysql/private/wsrep_thd.h +#usr/include/mysql/private/wsrep_utils.h +#usr/include/mysql/private/wsrep_var.h +#usr/include/mysql/private/wsrep_xid.h +#usr/include/mysql/psi +#usr/include/mysql/psi/mysql_file.h +#usr/include/mysql/psi/mysql_idle.h +#usr/include/mysql/psi/mysql_socket.h +#usr/include/mysql/psi/mysql_stage.h +#usr/include/mysql/psi/mysql_statement.h +#usr/include/mysql/psi/mysql_table.h +#usr/include/mysql/psi/mysql_thread.h +#usr/include/mysql/psi/psi.h +#usr/include/mysql/psi/psi_abi_v0.h +#usr/include/mysql/psi/psi_abi_v1.h +#usr/include/mysql/psi/psi_abi_v2.h +#usr/include/mysql/service_debug_sync.h +#usr/include/mysql/service_encryption.h +#usr/include/mysql/service_encryption_scheme.h +#usr/include/mysql/service_kill_statement.h +#usr/include/mysql/service_logger.h +#usr/include/mysql/service_md5.h +#usr/include/mysql/service_my_snprintf.h +#usr/include/mysql/service_progress_report.h +#usr/include/mysql/service_sha1.h +#usr/include/mysql/service_thd_alloc.h +#usr/include/mysql/service_thd_autoinc.h +#usr/include/mysql/service_thd_error_context.h +#usr/include/mysql/service_thd_specifics.h +#usr/include/mysql/service_thd_timezone.h +#usr/include/mysql/service_thd_wait.h +#usr/include/mysql/service_wsrep.h +#usr/include/mysql/services.h #usr/include/mysql/sql_common.h #usr/include/mysql/sql_state.h #usr/include/mysql/sslopt-case.h @@ -133,33 +489,78 @@ usr/bin/resolveip #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.so.18 +#usr/lib/libmysqlclient.so.18.0.0 #usr/lib/libmysqlclient_r.so -#usr/lib/libmysqlclient_r.so.15 -#usr/lib/libmysqlclient_r.so.15.0.0 +#usr/lib/libmysqlclient_r.so.18 +#usr/lib/libmysqlclient_r.so.18.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.so.18 +#usr/lib/mysql/libmysqlclient.so.18.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/lib/mysql/libmysqlclient_r.so.18 +#usr/lib/mysql/libmysqlclient_r.so.18.0.0 +#usr/lib/mysql/libmysqlservices.a +usr/lib/mysql/plugin +#usr/lib/mysql/plugin/adt_null.so +#usr/lib/mysql/plugin/auth_0x0100.so +#usr/lib/mysql/plugin/auth_pam.so +#usr/lib/mysql/plugin/auth_socket.so +#usr/lib/mysql/plugin/auth_test_plugin.so +#usr/lib/mysql/plugin/daemon_example.ini +#usr/lib/mysql/plugin/debug_key_management.so +#usr/lib/mysql/plugin/dialog.so +#usr/lib/mysql/plugin/dialog_examples.so +#usr/lib/mysql/plugin/example_key_management.so +#usr/lib/mysql/plugin/file_key_management.so +#usr/lib/mysql/plugin/ha_archive.so +#usr/lib/mysql/plugin/ha_blackhole.so +#usr/lib/mysql/plugin/ha_connect.so +#usr/lib/mysql/plugin/ha_example.so +#usr/lib/mysql/plugin/ha_federated.so +#usr/lib/mysql/plugin/ha_federatedx.so +#usr/lib/mysql/plugin/ha_innodb.so +#usr/lib/mysql/plugin/ha_mroonga.so +#usr/lib/mysql/plugin/ha_sphinx.so +#usr/lib/mysql/plugin/ha_spider.so +#usr/lib/mysql/plugin/ha_test_sql_discovery.so +#usr/lib/mysql/plugin/handlersocket.so +#usr/lib/mysql/plugin/libdaemon_example.so +#usr/lib/mysql/plugin/locales.so +#usr/lib/mysql/plugin/metadata_lock_info.so +#usr/lib/mysql/plugin/mypluglib.so +#usr/lib/mysql/plugin/mysql_clear_password.so +#usr/lib/mysql/plugin/qa_auth_client.so +#usr/lib/mysql/plugin/qa_auth_interface.so +#usr/lib/mysql/plugin/qa_auth_server.so +#usr/lib/mysql/plugin/query_cache_info.so +#usr/lib/mysql/plugin/query_response_time.so +#usr/lib/mysql/plugin/semisync_master.so +#usr/lib/mysql/plugin/semisync_slave.so +#usr/lib/mysql/plugin/server_audit.so +#usr/lib/mysql/plugin/simple_password_check.so +#usr/lib/mysql/plugin/sql_errlog.so +#usr/lib/mysql/plugin/wsrep_info.so +usr/libexec/mysqld +usr/libexec/rcmysql +#usr/share/aclocal/mysql.m4 +#usr/share/doc/mariadb-10.1.12 +#usr/share/doc/mariadb-10.1.12/COPYING +#usr/share/doc/mariadb-10.1.12/COPYING.LESSER +#usr/share/doc/mariadb-10.1.12/COPYING.thirdparty +#usr/share/doc/mariadb-10.1.12/CREDITS +#usr/share/doc/mariadb-10.1.12/EXCEPTIONS-CLIENT +#usr/share/doc/mariadb-10.1.12/INSTALL-BINARY +#usr/share/doc/mariadb-10.1.12/README +#usr/share/doc/mariadb-10.1.12/README-wsrep +#usr/share/man/man1/aria_chk.1 +#usr/share/man/man1/aria_dump_log.1 +#usr/share/man/man1/aria_ftdump.1 +#usr/share/man/man1/aria_pack.1 +#usr/share/man/man1/aria_read_log.1 #usr/share/man/man1/innochecksum.1 #usr/share/man/man1/msql2mysql.1 #usr/share/man/man1/my_print_defaults.1 @@ -172,16 +573,15 @@ usr/sbin/mysqlmanager #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_client_test_embedded.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_plugin.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 @@ -197,18 +597,38 @@ usr/sbin/mysqlmanager #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/mysqlslap.1 #usr/share/man/man1/mysqltest.1 +#usr/share/man/man1/mysqltest_embedded.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/mariadb-10.1.12 +#usr/share/mariadb-10.1.12/binary-configure +#usr/share/mariadb-10.1.12/magic +#usr/share/mariadb-10.1.12/my-huge.cnf +#usr/share/mariadb-10.1.12/my-innodb-heavy-4G.cnf +#usr/share/mariadb-10.1.12/my-large.cnf +#usr/share/mariadb-10.1.12/my-medium.cnf +#usr/share/mariadb-10.1.12/my-small.cnf +#usr/share/mariadb-10.1.12/mysql-log-rotate +#usr/share/mariadb-10.1.12/mysql.server +#usr/share/mariadb-10.1.12/mysqld_multi.server +#usr/share/mariadb-10.1.12/policy +#usr/share/mariadb-10.1.12/policy/apparmor +#usr/share/mariadb-10.1.12/policy/apparmor/README +#usr/share/mariadb-10.1.12/policy/apparmor/usr.sbin.mysqld +#usr/share/mariadb-10.1.12/policy/apparmor/usr.sbin.mysqld.local +#usr/share/mariadb-10.1.12/policy/selinux +#usr/share/mariadb-10.1.12/policy/selinux/README +#usr/share/mariadb-10.1.12/policy/selinux/mariadb-server.fc +#usr/share/mariadb-10.1.12/policy/selinux/mariadb-server.te +#usr/share/mariadb-10.1.12/wsrep.cnf +#usr/share/mariadb-10.1.12/wsrep_notify usr/share/mysql -#usr/share/mysql/binary-configure #usr/share/mysql/charsets #usr/share/mysql/charsets/Index.xml #usr/share/mysql/charsets/README @@ -244,7 +664,7 @@ usr/share/mysql #usr/share/mysql/dutch/errmsg.sys #usr/share/mysql/english #usr/share/mysql/english/errmsg.sys -#usr/share/mysql/errmsg.txt +#usr/share/mysql/errmsg-utf8.txt #usr/share/mysql/estonian #usr/share/mysql/estonian/errmsg.sys #usr/share/mysql/fill_help_tables.sql @@ -256,27 +676,22 @@ usr/share/mysql #usr/share/mysql/greek/errmsg.sys #usr/share/mysql/hungarian #usr/share/mysql/hungarian/errmsg.sys +#usr/share/mysql/install_spider.sql #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/maria_add_gis_sp.sql +#usr/share/mysql/maria_add_gis_sp_bootstrap.sql +#usr/share/mysql/mroonga +#usr/share/mysql/mroonga/install.sql +#usr/share/mysql/mroonga/uninstall.sql +#usr/share/mysql/mysql_performance_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 @@ -299,5 +714,5 @@ usr/share/mysql #usr/share/mysql/swedish/errmsg.sys #usr/share/mysql/ukrainian #usr/share/mysql/ukrainian/errmsg.sys +#usr/share/pkgconfig/mariadb.pc var/ipfire/backup/addons/includes/mysql -#var/run/mysql diff --git a/lfs/mysql b/lfs/mysql index edcd651..2253928 100644 --- a/lfs/mysql +++ b/lfs/mysql @@ -24,17 +24,17 @@ include Config -VER = 5.0.96 +VER = 10.1.12 -THISAPP = mysql-$(VER) +THISAPP = mariadb-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mysql -PAK_VER = 3 +PAK_VER = 4 -CFLAGS += -fno-strict-aliasing +CFLAGS += -fno-strict-aliasing -fno-delete-null-pointer-checks ############################################################################### # Top-level Rules @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bf280949049161aa68cf29e600d9ec79 +$(DL_FILE)_MD5 = a2c0809f27ec112139c2c50f03569b2b install : $(TARGET) @@ -77,30 +77,54 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ - --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) && cmake . \ + -DBUILD_CONFIG=mysql_release \ + -DFEATURE_SET="community" \ + -DNICE_PROJECT_NAME="MariaDB" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DINSTALL_SYSCONFDIR="/etc" \ + -DINSTALL_SYSCONF2DIR="/etc/my.cnf.d" \ + -DINSTALL_DOCDIR="share/doc/$(THISAPP)" \ + -DINSTALL_DOCREADMEDIR="share/doc/$(THISAPP)" \ + -DINSTALL_INCLUDEDIR="include/mysql" \ + -DINSTALL_INFODIR="share/info" \ + -DINSTALL_LIBDIR="lib/mysql" \ + -DINSTALL_MANDIR="share/man" \ + -DINSTALL_MYSQLSHAREDIR="share/mysql" \ + -DINSTALL_MYSQLTESTDIR="share/mysql-test" \ + -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ + -DINSTALL_SBINDIR="libexec" \ + -DINSTALL_SCRIPTDIR="bin" \ + -DINSTALL_SQLBENCHDIR="share" \ + -DINSTALL_SUPPORTFILESDIR="share/$(THISAPP)" \ + -DMYSQL_UNIX_ADDR="/var/run/mysql/mysql.sock" \ + -DMYSQL_DATADIR="/srv/mysql" \ + -DTMPDIR="/var/tmp" \ + -DPID_FILE_DIR="/var/run/mysql" + -DENABLED_LOCAL_INFILE=ON \ + -DWITH_EMBEDDED_SERVER=OFF \ + -DWITH_SSL=system \ + -DWITH_ZLIB=system \ + -DWITH_PCRE=system \ + -DIGNORE_AIO_CHECK=ON \ + -DWITH_JEMALLOC=OFF 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 + rm -rf /usr/share/mysql-test /usr/bin/mysql_client_test + rm -rf /usr/share/sql-bench + rm -rf /tmp/mysql + install -v -m 644 $(DIR_SRC)/config/mysql/my.cnf /etc/my.cnf mkdir -p /srv/mysql - mysql_install_db --user=mysql --force + cd /usr/ && mysql_install_db --user=mysql --force chgrp -v mysql /srv/mysql{,/test,/mysql} chown mysql.mysql /srv/mysql/ - install -v -m755 -o mysql -g mysql -d /var/run/mysql + install -v -m 755 -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 initscript + install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/mysql \ + /etc/rc.d/init.d/mysql @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 8392e30..0a2b8ae 100755 --- a/make.sh +++ b/make.sh @@ -391,6 +391,7 @@ buildipfire() { export LOGFILE ipfiremake configroot ipfiremake backup + ipfiremake initscripts ipfiremake pkg-config ipfiremake libusb ipfiremake libusb-compat @@ -521,6 +522,8 @@ buildipfire() { ipfiremake libxml2 ipfiremake libxslt ipfiremake BerkeleyDB + ipfiremake libarchive + ipfiremake cmake ipfiremake mysql ipfiremake cyrus-sasl ipfiremake openldap @@ -552,7 +555,6 @@ buildipfire() { ipfiremake hdparm ipfiremake sdparm ipfiremake mtools - ipfiremake initscripts ipfiremake whatmask ipfiremake conntrack-tools ipfiremake libupnp @@ -668,8 +670,6 @@ buildipfire() { ipfiremake libshout ipfiremake xvid ipfiremake libmpeg2 - ipfiremake libarchive - ipfiremake cmake ipfiremake gnump3d ipfiremake rsync ipfiremake tcpwrapper diff --git a/src/initscripts/init.d/mysql b/src/initscripts/init.d/mysql index 994e3c2..2c8cfbc 100644 --- a/src/initscripts/init.d/mysql +++ b/src/initscripts/init.d/mysql @@ -10,7 +10,7 @@ . /etc/sysconfig/rc . $rc_functions -PIDFILE=/srv/mysql/`/bin/hostname`.pid +PIDFILE=/var/run/mysql/mysql.pid KILLDELAY=20 case "$1" in @@ -66,7 +66,7 @@ case "$1" in ;; status) - statusproc /usr/sbin/mysqld + statusproc /usr/libexec/mysqld ;; *) diff --git a/src/paks/mysql/update.sh b/src/paks/mysql/update.sh index 548b9db..5e76574 100644 --- a/src/paks/mysql/update.sh +++ b/src/paks/mysql/update.sh @@ -27,6 +27,7 @@ if [ ! -e "/var/ipfire/backup/addons/includes/mysql" ]; then cat <<EOF > /var/ipfire/backup/addons/includes/mysql /etc/my.cnf +/etc/my.cnf.d /srv/mysql EOF fi @@ -44,6 +45,9 @@ extract_files # Restore backup restore_backup "${NAME}" +# Remove basedir configuration line +sed -e "/^basedir=/d" -i /etc/my.cnf + # Restart the service start_service "${NAME}" -- 2.4.4

4 16

Perl 5.22.1 integration
by Marcel Lorenz 28 May '16

28 May '16

Hi, i will start a discussion for the integration of Perl 5.22.x into IPFire. I have been working for over half a year on the files. My motivation came from the use of SpamAssassin. This application is written in Perl. The old Perl modules from IPFire are as a security risk. First i update the Perl LFS and rootfile only. All the other Perl modules remain old. I began individual modules to update, but it was very expensive. Since I had the idea to take all modules to one or two LFS together. This has the advantage that all individual Perl modules disappear make.sh from and this is clearly shorter. The two LFS files and the associated Rootfiles are also easier to maintain. The individual Perl modules in Pakfire can then also be removed. Perl is always complete and up to date with its modules. In my mailserver branch I have this development as far finished. However, I had the modules-LFS divided into two files because make is having trouble with to large LFS files. Also have Perl 5.22.1 integrated into the toolchain. The need still less, gdbm and berkeley DB4 before. I created three files from the many Perl files: perl-buildtools perl-modules1 perl-modules2 The current folder size of /usr/lib/perl5 is about 75MB with Perl 5.22.1 and all modules and 55Mb with Perl 5.12.3. A Perl-Modules list can be found here: http://people.ipfire.org/~mlorenz/mp/22/perl.txt This includes all needed modules for Amavisd, all from Pakfire and many more. All updated to the latest version from CPAN (December 2015) Here the perl-buildtools LFS with the current modules from CPAN as an example. The modules included are needed around the other current Perl modules to build: ############################################################################### # # # IPFire.org - A linux based firewall # # Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # # the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # # # # This program is distributed in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # GNU General Public License for more details. # # # # You should have received a copy of the GNU General Public License # # along with this program. If not, see <http://www.gnu.org/licenses/>. # # # ############################################################################### ############################################################################### # Definitions ############################################################################### include Config VER = 2015.10 THISAPP = perl-buildtools-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = perl-buildtools DEPS = "perl" PAK_VER = 1 ############################################################################### # Top-level Rules ############################################################################### objects = ExtUtils-Constant-0.23.tar.gz \ ExtUtils-MakeMaker-7.10.tar.gz \ ExtUtils-Manifest-1.70.tar.gz \ Module-Build-0.4214.tar.gz \ Module-Metadata-1.000027.tar.gz \ Perl-OSType-1.009.tar.gz \ Test-Deep-0.119.tar.gz \ Test-Simple-1.001014.tar.gz \ version-0.9912.tar.gz ExtUtils-Constant-0.23.tar.gz = $(DL_FROM)/ExtUtils-Constant-0.23.tar.gz ExtUtils-MakeMaker-7.10.tar.gz = $(DL_FROM)/ExtUtils-MakeMaker-7.10.tar.gz ExtUtils-Manifest-1.70.tar.gz = $(DL_FROM)/ExtUtils-Manifest-1.70.tar.gz Module-Build-0.4214.tar.gz = $(DL_FROM)/Module-Build-0.4214.tar.gz Module-Metadata-1.000027.tar.gz = $(DL_FROM)/Module-Metadata-1.000027.tar.gz Perl-OSType-1.009.tar.gz = $(DL_FROM)/Perl-OSType-1.009.tar.gz Test-Deep-0.119.tar.gz = $(DL_FROM)/Test-Deep-0.119.tar.gz Test-Simple-1.001014.tar.gz = $(DL_FROM)/Test-Simple-1.001014.tar.gz version-0.9912.tar.gz = $(DL_FROM)/version-0.9912.tar.gz ExtUtils-Constant-0.23.tar.gz_MD5 = bd3ec6d22ffab7e5cc05b1331a888d15 ExtUtils-MakeMaker-7.10.tar.gz_MD5 = 2639a21adee5e0a903730c12dcba08ec ExtUtils-Manifest-1.70.tar.gz_MD5 = 8ccb9c1f3bca14c117a74bc7b43be095 Module-Build-0.4214.tar.gz_MD5 = 7b7ca5a47bef48c50c8b5906ca3ac7fb Module-Metadata-1.000027.tar.gz_MD5 = a0bf9b900dfd49c57702de3ee3801d42 Perl-OSType-1.009.tar.gz_MD5 = 9e0cae3812bc80815f00732bde1b7e61 Test-Deep-0.119.tar.gz_MD5 = edb72e9b1874efe3b0c95324fb063e51 Test-Simple-1.001014.tar.gz_MD5 = db7f57fd595e3e1c93c972307a88fa6e version-0.9912.tar.gz_MD5 = 404a7174f3e38e4f8fad3e1eefce5412 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) cd $(DIR_SRC) && tar zxf $(DIR_DL)/Perl-OSType-1.009.tar.gz cd $(DIR_SRC)/Perl-OSType-1.009 && perl Makefile.PL cd $(DIR_SRC)/Perl-OSType-1.009 && make $(MAKETUNING) cd $(DIR_SRC)/Perl-OSType-1.009 && make install @rm -rf $(DIR_SRC)/Perl-OSType-1.009 cd $(DIR_SRC) && tar zxf $(DIR_DL)/version-0.9912.tar.gz cd $(DIR_SRC)/version-0.9912 && perl Makefile.PL cd $(DIR_SRC)/version-0.9912 && make $(MAKETUNING) cd $(DIR_SRC)/version-0.9912 && make install @rm -rf $(DIR_SRC)/version-0.9912 cd $(DIR_SRC) && tar zxf $(DIR_DL)/Module-Metadata-1.000027.tar.gz cd $(DIR_SRC)/Module-Metadata-1.000027 && perl Makefile.PL cd $(DIR_SRC)/Module-Metadata-1.000027 && make $(MAKETUNING) cd $(DIR_SRC)/Module-Metadata-1.000027 && make install @rm -rf $(DIR_SRC)/Module-Metadata-1.000027 cd $(DIR_SRC) && tar zxf $(DIR_DL)/Module-Build-0.4214.tar.gz cd $(DIR_SRC)/Module-Build-0.4214 && perl Makefile.PL cd $(DIR_SRC)/Module-Build-0.4214 && make $(MAKETUNING) cd $(DIR_SRC)/Module-Build-0.4214 && make install @rm -rf $(DIR_SRC)/Module-Build-0.4214 cd $(DIR_SRC) && tar zxf $(DIR_DL)/Test-Deep-0.119.tar.gz cd $(DIR_SRC)/Test-Deep-0.119 && perl Makefile.PL cd $(DIR_SRC)/Test-Deep-0.119 && make $(MAKETUNING) cd $(DIR_SRC)/Test-Deep-0.119 && make install @rm -rf $(DIR_SRC)/Test-Deep-0.119 cd $(DIR_SRC) && tar zxf $(DIR_DL)/Test-Simple-1.001014.tar.gz cd $(DIR_SRC)/Test-Simple-1.001014 && perl Makefile.PL cd $(DIR_SRC)/Test-Simple-1.001014 && make $(MAKETUNING) cd $(DIR_SRC)/Test-Simple-1.001014 && make install @rm -rf $(DIR_SRC)/Test-Simple-1.001014 cd $(DIR_SRC) && tar zxf $(DIR_DL)/ExtUtils-Constant-0.23.tar.gz cd $(DIR_SRC)/ExtUtils-Constant-0.23 && perl Makefile.PL cd $(DIR_SRC)/ExtUtils-Constant-0.23 && make $(MAKETUNING) cd $(DIR_SRC)/ExtUtils-Constant-0.23 && make install @rm -rf $(DIR_SRC)/ExtUtils-Constant-0.23 cd $(DIR_SRC) && tar zxf $(DIR_DL)/ExtUtils-MakeMaker-7.10.tar.gz cd $(DIR_SRC)/ExtUtils-MakeMaker-7.10 && perl Makefile.PL cd $(DIR_SRC)/ExtUtils-MakeMaker-7.10 && make $(MAKETUNING) cd $(DIR_SRC)/ExtUtils-MakeMaker-7.10 && make install @rm -rf $(DIR_SRC)/ExtUtils-MakeMaker-7.10 cd $(DIR_SRC) && tar zxf $(DIR_DL)/ExtUtils-Manifest-1.70.tar.gz cd $(DIR_SRC)/ExtUtils-Manifest-1.70 && perl Makefile.PL cd $(DIR_SRC)/ExtUtils-Manifest-1.70 && make $(MAKETUNING) cd $(DIR_SRC)/ExtUtils-Manifest-1.70 && make install @rm -rf $(DIR_SRC)/ExtUtils-Manifest-1.70 @$(POSTBUILD) That would be my suggestion for integration of Perl 5.22.1. On request, I can create big patches and send it to the mailing list. Perl 5.22.x works are in several months generated by my ISO's unremarkable. It is known that a few startup scripts need to be adjusted (amavisd). Please forgive me my simple English... Google translator helped me. :) Greetings, Marcel Lorenz

4 5

[PATCH 1/2] New package: libcheck (dependency for kbd 2.0.3)
by Marcel Lorenz 09 May '16

09 May '16

This package is only need for build kbd version 2.0.3 No files from this package are needed in the distribution. The package was original named "check" but the make.sh can't handle this name. ;-) Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/common/libcheck | 43 ++++++++++++++++++++++ lfs/libcheck | 77 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 config/rootfiles/common/libcheck create mode 100644 lfs/libcheck diff --git a/config/rootfiles/common/libcheck b/config/rootfiles/common/libcheck new file mode 100644 index 0000000..0af3fcf --- /dev/null +++ b/config/rootfiles/common/libcheck @@ -0,0 +1,43 @@ +#usr/bin/checkmk +#usr/include/check.h +#usr/include/check_stdint.h +#usr/lib/libcheck.a +#usr/lib/libcheck.la +#usr/lib/libcheck.so +#usr/lib/libcheck.so.0 +#usr/lib/libcheck.so.0.0.0 +#usr/lib/pkgconfig/check.pc +#usr/share/aclocal/check.m4 +#usr/share/doc/check +#usr/share/doc/check/COPYING.LESSER +#usr/share/doc/check/ChangeLog +#usr/share/doc/check/ChangeLogOld +#usr/share/doc/check/NEWS +#usr/share/doc/check/README +#usr/share/doc/check/SVNChangeLog +#usr/share/doc/check/example +#usr/share/doc/check/example/Makefile.am +#usr/share/doc/check/example/README +#usr/share/doc/check/example/configure.ac +#usr/share/doc/check/example/src +#usr/share/doc/check/example/src/Makefile.am +#usr/share/doc/check/example/src/main.c +#usr/share/doc/check/example/src/money.1.c +#usr/share/doc/check/example/src/money.1.h +#usr/share/doc/check/example/src/money.2.h +#usr/share/doc/check/example/src/money.3.c +#usr/share/doc/check/example/src/money.4.c +#usr/share/doc/check/example/src/money.5.c +#usr/share/doc/check/example/src/money.6.c +#usr/share/doc/check/example/src/money.c +#usr/share/doc/check/example/src/money.h +#usr/share/doc/check/example/tests +#usr/share/doc/check/example/tests/Makefile.am +#usr/share/doc/check/example/tests/check_money.1.c +#usr/share/doc/check/example/tests/check_money.2.c +#usr/share/doc/check/example/tests/check_money.3.c +#usr/share/doc/check/example/tests/check_money.6.c +#usr/share/doc/check/example/tests/check_money.7.c +#usr/share/doc/check/example/tests/check_money.c +#usr/share/info/check.info +#usr/share/man/man1/checkmk.1 diff --git a/lfs/libcheck b/lfs/libcheck new file mode 100644 index 0000000..6e6291e --- /dev/null +++ b/lfs/libcheck @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2012 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.10.0 + +THISAPP = check-$(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 = 53c5e5c77d090e103a17f3ed7fd7d8b8 + +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 axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) -- 1.9.1

2 4

Duplicate files created by 'iptables 1.6.0' and 'ebtables 2.0.10-4'
by Matthias Fischer 08 Apr '16

08 Apr '16

Hi, As I wrote before I'm testing with 'iptables 1.6.0'. While looking which files I would need to backup so I could run some tests on my production machine I found that 'iptables 1.6.0' and current 'ebtables 2.0.10-4' are building duplicate files. 'ebtables' puts them in '/usr/lib', 'iptables 1.6.0' in '/lib/xtables': libebt_802_3.so libebt_ip.so libebt_log.so libebt_mark_m.so What would be the best way to handle this? Comment in (which?) rootfile? As an info: 'iptables 1.6.0' was build with the new option '--disable-nftables', otherwise build failed: "fatal error: libnftnl/rule.h: No such file or directory". Best, Matthias

2 8

[PATCH] squid 3.4.14: Bugfix for #4323 (Netfilter broken cross-includes with Linux 4.2)
by Matthias Fischer 07 Apr '16

07 Apr '16

For details see: http://bugs.squid-cache.org/show_bug.cgi?id=4323 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/squid | 2 ++ lfs/squid | 3 ++- src/patches/squid-3.4-13231.patch | 48 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 src/patches/squid-3.4-13231.patch diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index c8227e3..83cfe3f 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -2145,6 +2145,8 @@ usr/lib/squid/icons/silk/script_palette.png usr/lib/squid/log_db_daemon usr/lib/squid/log_file_daemon usr/lib/squid/mib.txt +usr/lib/squid/negotiate_kerberos_auth +usr/lib/squid/negotiate_kerberos_auth_test usr/lib/squid/negotiate_wrapper_auth usr/lib/squid/ntlm_fake_auth usr/lib/squid/ntlm_smb_lm_auth diff --git a/lfs/squid b/lfs/squid index 997c660..a9c5f37 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13228.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4.14-fix-max-file-descriptors.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13230.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13231.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/squid-3.4-13231.patch b/src/patches/squid-3.4-13231.patch new file mode 100644 index 0000000..045ad70 --- /dev/null +++ b/src/patches/squid-3.4-13231.patch @@ -0,0 +1,48 @@ +------------------------------------------------------------ +revno: 13231 +revision-id: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm +parent: squid3(a)treenet.co.nz-20160212045316-zwx4r9we4gf27rx3 +fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4323 +author: Francesco Chemolli <kinkie(a)squid-cache.org> +committer: Amos Jeffries <squid3(a)treenet.co.nz> +branch nick: 3.4 +timestamp: Sun 2016-02-21 04:08:59 +1300 +message: + Bug 4323: Netfilter broken cross-includes with Linux 4.2 +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# testament_sha1: 10fa174d2821207d0bf89ef3013e8f4c3f99f9e3 +# timestamp: 2016-02-20 15:50:56 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# base_revision_id: squid3(a)treenet.co.nz-20160212045316-\ +# zwx4r9we4gf27rx3 +# +# Begin patch +=== modified file 'compat/os/linux.h' +--- compat/os/linux.h 2012-08-28 13:00:30 +0000 ++++ compat/os/linux.h 2016-02-20 15:08:59 +0000 +@@ -22,6 +22,21 @@ + #endif + + /* ++ * Netfilter header madness. (see Bug 4323) ++ * ++ * Netfilter have a history of defining their own versions of network protocol ++ * primitives without sufficient protection against the POSIX defines which are ++ * aways present in Linux. ++ * ++ * netinet/in.h must be included before any other sys header in order to properly ++ * activate include guards in <linux/libc-compat.h> the kernel maintainers added ++ * to workaround it. ++ */ ++#if HAVE_NETINET_IN_H ++#include <netinet/in.h> ++#endif ++ ++/* + * sys/capability.h is only needed in Linux apparently. + * + * HACK: LIBCAP_BROKEN Ugly glue to get around linux header madness colliding with glibc + -- 2.7.2

3 4

Re: [PATCH] New package iperf3
by Michael Tremer 01 Apr '16

01 Apr '16

Hi, we use -fomit-frame-pointer only for i586 and ARM. Duh. http://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=tools/make-functions;h=a42… You can strip -pg from the Makefile for all arches though, because that will generate faster code. Best, -Michael P.S. Don't forget to CC the list :) On Thu, 2016-03-31 at 14:46 +0200, Jonatan Schlag wrote: > Hi, > this is bad. > I build for x86_64 here. I will have a look at this and send in a new > patch. > > Regards Jonatan > > Am Do, 31. Mär, 2016 um 2:42 schrieb Michael Tremer <michael.tremer@i > pfire.org>: > > Hi, > > > > this still fails with the same error: > > > > gcc -DHAVE_CONFIG_H -I. -pg -g -O2 -pipe -Wall -Wp,- > > D_FORTIFY_SOURCE=2 -fexceptions -fPIC -fstack-protector-strong -- > > param=ssp-buffer-size=4 -march=i586 -mtune=generic -fomit-frame- > > pointer -Wall -MT iperf3_profile-iperf_client_api.o -MD -MP -MF > > .deps/iperf3_profile-iperf_client_api.Tpo -c -o iperf3_profile- > > iperf_client_api.o `test -f 'iperf_client_api.c' || echo > > './'`iperf_client_api.c > > gcc: error: -pg and -fomit-frame-pointer are incompatible > > > > I am building for i586 here. > > > > -Michael > > > > On Wed, 2016-03-30 at 17:59 +0200, Jonatan Schlag wrote: > > Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> > > --- > > config/rootfiles/packages/iperf3 | 9 +++++ > > lfs/iperf3 | 83 > > ++++++++++++++++++++++++++++++++++++++++ > > make.sh | 1 + > > 3 files changed, 93 insertions(+) > > create mode 100644 config/rootfiles/packages/iperf3 > > create mode 100644 lfs/iperf3 > > > > diff --git a/config/rootfiles/packages/iperf3 > > b/config/rootfiles/packages/iperf3 > > new file mode 100644 > > index 0000000..7057f11 > > --- /dev/null > > +++ b/config/rootfiles/packages/iperf3 > > @@ -0,0 +1,9 @@ > > +usr/bin/iperf3 > > +#usr/include/iperf_api.h > > +#usr/lib/libiperf.a > > +#usr/lib/libiperf.la > > +#usr/lib/libiperf.so > > +usr/lib/libiperf.so.0 > > +usr/lib/libiperf.so.0.0.0 > > +#usr/share/man/man1/iperf3.1 > > +#usr/share/man/man3/libiperf.3 > > diff --git a/lfs/iperf3 b/lfs/iperf3 > > new file mode 100644 > > index 0000000..44f9f00 > > --- /dev/null > > +++ b/lfs/iperf3 > > @@ -0,0 +1,83 @@ > > +################################################################# > > ### > > ########### > > +# > > > > # > > +# IPFire.org - A linux based > > firewall # > > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> > > > > # > > +# > > > > # > > +# This program is free software: you can redistribute it and/or > > modify # > > +# it under the terms of the GNU General Public License as > > published > > by # > > +# the Free Software Foundation, either version 3 of the License, > > or # > > +# (at your option) any later > > version. # > > +# > > > > # > > +# This program is distributed in the hope that it will be > > useful, # > > +# but WITHOUT ANY WARRANTY; without even the implied warranty > > of # > > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See > > the # > > +# GNU General Public License for more > > details. # > > +# > > > > # > > +# You should have received a copy of the GNU General Public > > License # > > +# along with this program. If not, see <http://www.gnu.org/licen > > ses > > />. # > > +# > > > > # > > +################################################################# > > ### > > ########### > > + > > +################################################################# > > ### > > ########### > > +# Definitions > > +################################################################# > > ### > > ########### > > + > > +include Config > > + > > +VER = 3.1.2 > > + > > +THISAPP = iperf-$(VER) > > +DL_FILE = $(THISAPP).tar.gz > > +DL_FROM = $(URL_IPFIRE) > > +DIR_APP = $(DIR_SRC)/$(THISAPP) > > +TARGET = $(DIR_INFO)/$(THISAPP) > > +PROG = iperf3 > > +PAK_VER = 1 > > + > > +DEPS = "" > > + > > +################################################################# > > ### > > ########### > > +# Top-level Rules > > +################################################################# > > ### > > ########### > > + > > +objects = $(DL_FILE) > > + > > +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > + > > +$(DL_FILE)_MD5 = f48a1b45c68647a9d8a8491af44470d6 > > + > > +install : $(TARGET) > > +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) > > + > > +download :$(patsubst %,$(DIR_DL)/%,$(objects)) > > + > > +md5 : $(subst %,%_MD5,$(objects)) > > + > > +dist:. > > + $(PAK) > > + > > +################################################################# > > ### > > ########### > > +# Downloading, checking, md5sum > > +################################################################# > > ### > > ########### > > + > > +$(patsubst %,$(DIR_CHK)/%,$(objects)) : > > + @$(CHECK) > > + > > +$(patsubst %,$(DIR_DL)/%,$(objects)) : > > + @$(LOAD) > > + > > +$(subst %,%_MD5,$(objects)) : > > + @$(MD5) > > + > > +################################################################# > > ### > > ########### > > +# Installation Details > > +################################################################# > > ### > > ########### > > + > > +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > + @$(PREBUILD) > > + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf > > $(DIR_DL)/$(DL_FILE) > > + cd $(DIR_APP) && ./configure --prefix=/usr > > + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) > > + cd $(DIR_APP) && make install > > + @rm -rf $(DIR_APP) > > + @$(POSTBUILD) > > diff --git a/make.sh b/make.sh > > index da4bf16..d471db9 100755 > > --- a/make.sh > > +++ b/make.sh > > @@ -744,6 +744,7 @@ buildipfire() { > > ipfiremake gutenprint > > ipfiremake apcupsd > > ipfiremake iperf > > + ipfiremake iperf3 > > ipfiremake netcat > > ipfiremake 7zip > > ipfiremake lynis

2 1

[PATCH] pcre: Update to 8.38
by Matthias Fischer 31 Mar '16

31 Mar '16

Bugfix release For complete changelog see: http://www.pcre.org/original/changelog.txt Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/pcre | 2 +- lfs/pcre | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre index 8c4cc2a..1d6310f 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -10,7 +10,7 @@ #usr/lib/libpcre.la usr/lib/libpcre.so usr/lib/libpcre.so.1 -usr/lib/libpcre.so.1.2.5 +usr/lib/libpcre.so.1.2.6 #usr/lib/libpcrecpp.la usr/lib/libpcrecpp.so usr/lib/libpcrecpp.so.0 diff --git a/lfs/pcre b/lfs/pcre index fd66350..ddbd0b5 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2016 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 # @@ -24,7 +24,7 @@ include Config -VER = 8.37 +VER = 8.38 THISAPP = pcre-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e +$(DL_FILE)_MD5 = 8a353fe1450216b6655dfcf3561716d9 install : $(TARGET) @@ -70,11 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --disable-static \ -- 2.8.0

3 4

[PATCH] New package iperf3
by Jonatan Schlag 31 Mar '16

31 Mar '16

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- config/rootfiles/packages/iperf3 | 9 +++++ lfs/iperf3 | 83 ++++++++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 93 insertions(+) create mode 100644 config/rootfiles/packages/iperf3 create mode 100644 lfs/iperf3 diff --git a/config/rootfiles/packages/iperf3 b/config/rootfiles/packages/iperf3 new file mode 100644 index 0000000..7057f11 --- /dev/null +++ b/config/rootfiles/packages/iperf3 @@ -0,0 +1,9 @@ +usr/bin/iperf3 +#usr/include/iperf_api.h +#usr/lib/libiperf.a +#usr/lib/libiperf.la +#usr/lib/libiperf.so +usr/lib/libiperf.so.0 +usr/lib/libiperf.so.0.0.0 +#usr/share/man/man1/iperf3.1 +#usr/share/man/man3/libiperf.3 diff --git a/lfs/iperf3 b/lfs/iperf3 new file mode 100644 index 0000000..44f9f00 --- /dev/null +++ b/lfs/iperf3 @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.1.2 + +THISAPP = iperf-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = iperf3 +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f48a1b45c68647a9d8a8491af44470d6 + +install : $(TARGET) +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist:. + $(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index da4bf16..d471db9 100755 --- a/make.sh +++ b/make.sh @@ -744,6 +744,7 @@ buildipfire() { ipfiremake gutenprint ipfiremake apcupsd ipfiremake iperf + ipfiremake iperf3 ipfiremake netcat ipfiremake 7zip ipfiremake lynis -- 2.1.4

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2016