* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9d0ed61c8c0bb9d197fc5c5844d77a92073906ee
@ 2017-01-23 13:14 git
0 siblings, 0 replies; only message in thread
From: git @ 2017-01-23 13:14 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 31831 bytes --]
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 3.x development tree".
The branch, master has been updated
via 9d0ed61c8c0bb9d197fc5c5844d77a92073906ee (commit)
via 255ac251fb94cfeecdb4c1146ab20fd1e21bfdf3 (commit)
via 2b968a3fa53e9d4e196c9c9c7c812662d63f124a (commit)
via 4a01139ea7c8a9094610debdcb967137387ffc7e (commit)
via 11858f068f866d19a1115d889965b093f48f16df (commit)
from c74c6a75887b0897432e0adbf4bdb008b9461497 (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 9d0ed61c8c0bb9d197fc5c5844d77a92073906ee
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jan 23 13:10:08 2017 +0000
zlib: Update to 1.2.11
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 255ac251fb94cfeecdb4c1146ab20fd1e21bfdf3
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Jan 13 13:35:00 2017 +0100
python3: Update to version 3.6.0
This is a major update to the latest stable version of the
Python 3 series.
Fixes #11086.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2b968a3fa53e9d4e196c9c9c7c812662d63f124a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Jan 13 12:52:31 2017 +0100
git: Add systemd file for git-daemon
Add systemd unit file for a socket-based activation
of git-deamon to export the git repositories.
Fixes #10983.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4a01139ea7c8a9094610debdcb967137387ffc7e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Jan 13 09:13:05 2017 +0100
xfsprogs: Update to 4.9.0
This is an update to the latest available version of xfsprogs.
* Change source URL and tarball format.
* Add note for the non existing testsuite.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 11858f068f866d19a1115d889965b093f48f16df
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Jan 12 15:07:45 2017 +0100
openssh: Update to 7.4
This is a minor update to the latest stable version of OpenSSH.
* Enable root login with password.
* Drop selinux related modules from pam file.
* Rework Systemd unit files and add files for socked based
activation.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
git/git.nm | 23 +++-
git/systemd/git.socket | 9 ++
git/systemd/git(a).service | 8 ++
openssh/openssh.nm | 13 ++-
openssh/sshd.pam | 5 -
openssh/systemd/sshd.service | 7 +-
openssh/systemd/sshd.socket | 11 ++
openssh/systemd/sshd(a).service | 9 ++
...-3.4.3-lib64.patch => python-3.6.0-lib64.patch} | 118 ++++++++++-----------
python3/python3.nm | 40 +++----
xfsprogs/xfsprogs.nm | 7 +-
zlib/zlib.nm | 2 +-
12 files changed, 158 insertions(+), 94 deletions(-)
create mode 100644 git/systemd/git.socket
create mode 100644 git/systemd/git(a).service
create mode 100644 openssh/systemd/sshd.socket
create mode 100644 openssh/systemd/sshd(a).service
rename python3/{python-3.4.3-lib64.patch => python-3.6.0-lib64.patch} (67%)
Difference in files:
diff --git a/git/git.nm b/git/git.nm
index 13f05db..9ad9bbe 100644
--- a/git/git.nm
+++ b/git/git.nm
@@ -5,7 +5,7 @@
name = git
version = 2.6.3
-release = 2
+release = 3
groups = Development/Tools
url = http://git-scm.com/
@@ -114,6 +114,27 @@ packages
%{gitcoredir}/git-daemon
%{mandir}/man1/git-daemon*
%{sharedstatedir}/git
+ %{unitdir}/git(a).service
+ %{unitdir}/git.socket
+ end
+
+ script postin
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script preun
+ systemctl --no-reload disable git.socket >/dev/null 2>&1 || :
+ systemctl stop git.socket >/dev/null 2>&1 || :
+ systemctl stop git(a).service >/dev/null 2>&1 || :
+ end
+
+ script postun
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script postup
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ systemctl try-restart git.socket >/dev/null 2>&1 || :
end
end
diff --git a/git/systemd/git.socket b/git/systemd/git.socket
new file mode 100644
index 0000000..3dec01d
--- /dev/null
+++ b/git/systemd/git.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Activation Socket
+
+[Socket]
+ListenStream=9418
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/git/systemd/git(a).service b/git/systemd/git(a).service
new file mode 100644
index 0000000..185ff25
--- /dev/null
+++ b/git/systemd/git(a).service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Git Repositories Server Daemon
+Documentation=man:git-daemon(1)
+
+[Service]
+User=nobody
+ExecStart=-/usr/libexec/git-core/git-daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose
+StandardInput=socket
diff --git a/openssh/openssh.nm b/openssh/openssh.nm
index 2e8de76..8b7ecea 100644
--- a/openssh/openssh.nm
+++ b/openssh/openssh.nm
@@ -4,7 +4,7 @@
###############################################################################
name = openssh
-version = 7.3p1
+version = 7.4p1
release = 1
groups = Application/Internet
@@ -60,11 +60,12 @@ build
# Disable GSS API authentication because KRB5 is required for that.
sed -e "s/^.*GSSAPIAuthentication/#&/" -i %{BUILDROOT}/etc/ssh/ssh_config
- # Enable PAM usage, disable ChallengeResponseAuthentication and disable Motd.
+ # Enable PAM usage, disable ChallengeResponseAuthentication, enable root login and disable Motd.
sed \
-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
-e '/^#PrintMotd yes$/c PrintMotd no' \
-e '/^#UsePAM no$/c UsePAM yes' \
+ -e '/^#PermitRootLogin prohibit-password$/c PermitRootLogin yes' \
-i %{BUILDROOT}/etc/ssh/sshd_config
# Install scriptfile for key generation
@@ -140,6 +141,8 @@ packages
%{sysconfdir}/ssh/sshd_config
%{unitdir}/sshd.service
%{unitdir}/sshd-keygen.service
+ %{unitdir}/sshd(a).service
+ %{unitdir}/sshd.socket
%{libdir}/openssh/sftp-server
%{sbindir}/sshd-keygen
%{sbindir}/sshd
@@ -173,7 +176,9 @@ packages
script preun
/bin/systemctl --no-reload disable sshd.service >/dev/null 2>&1 || :
+ /bin/systemctl --no-reload disable sshd.socket
/bin/systemctl stop sshd.service >/dev/null 2>&1 || :
+ /bin/systemctl stop sshd.socket >/dev/null 2>&1 || :
end
script postun
@@ -181,6 +186,10 @@ packages
end
script postup
+ # Enable root login.
+ sed -e '/^#PermitRootLogin prohibit-password$/c PermitRootLogin yes' \
+ -i %{sysconfdir}/ssh/sshd_config
+
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
/bin/systemctl try-restart sshd.service >/dev/null 2>&1 || :
diff --git a/openssh/sshd.pam b/openssh/sshd.pam
index a80e450..a9af149 100644
--- a/openssh/sshd.pam
+++ b/openssh/sshd.pam
@@ -1,15 +1,10 @@
#%PAM-1.0
-auth required pam_sepermit.so
auth substack password-auth
auth include postlogin
account required pam_nologin.so
account include password-auth
password include password-auth
-# pam_selinux.so close should be the first session rule
-session required pam_selinux.so close
session required pam_loginuid.so
-# pam_selinux.so open should only be followed by sessions to be executed in the user context
-session required pam_selinux.so open env_params
session optional pam_keyinit.so force revoke
session include password-auth
session include postlogin
diff --git a/openssh/systemd/sshd.service b/openssh/systemd/sshd.service
index 9007d89..8372355 100644
--- a/openssh/systemd/sshd.service
+++ b/openssh/systemd/sshd.service
@@ -1,11 +1,14 @@
[Unit]
Description=OpenSSH server daemon
-After=syslog.target network.target auditd.service
+After=syslog.target network.target auditd.service sshd-keygen.service
+Wants=sshd-keygen.service
[Service]
-ExecStartPre=/usr/sbin/sshd-keygen
ExecStart=/usr/sbin/sshd -D
ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+RestartSec=30s
[Install]
WantedBy=multi-user.target
diff --git a/openssh/systemd/sshd.socket b/openssh/systemd/sshd.socket
new file mode 100644
index 0000000..caa50c4
--- /dev/null
+++ b/openssh/systemd/sshd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenSSH Server Socket
+Documentation=man:sshd(8) man:sshd_config(5)
+Conflicts=sshd.service
+
+[Socket]
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/openssh/systemd/sshd(a).service b/openssh/systemd/sshd(a).service
new file mode 100644
index 0000000..57862c0
--- /dev/null
+++ b/openssh/systemd/sshd(a).service
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenSSH per-connection server daemon
+Documentation=man:sshd(8) man:sshd_config(5)
+Wants=sshd-keygen.service
+After=sshd-keygen.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i
+StandardInput=socket
diff --git a/python3/python-3.4.3-lib64.patch b/python3/python-3.4.3-lib64.patch
deleted file mode 100644
index db5fd95..0000000
--- a/python3/python-3.4.3-lib64.patch
+++ /dev/null
@@ -1,192 +0,0 @@
---- Python-3.4.0b1/Lib/distutils/command/install.py.lib64 2013-11-24 21:36:54.000000000 +0100
-+++ Python-3.4.0b1/Lib/distutils/command/install.py 2013-11-27 11:10:43.821150774 +0100
-@@ -45,14 +45,14 @@ else:
- INSTALL_SCHEMES = {
- 'unix_prefix': {
- 'purelib': '$base/lib/python$py_version_short/site-packages',
-- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
- 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
- },
- 'unix_home': {
- 'purelib': '$base/lib/python',
-- 'platlib': '$base/lib/python',
-+ 'platlib': '$base/lib64/python',
- 'headers': '$base/include/python/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
---- Python-3.4.0b1/Lib/distutils/sysconfig.py.lib64 2013-11-24 21:36:54.000000000 +0100
-+++ Python-3.4.0b1/Lib/distutils/sysconfig.py 2013-11-27 11:10:43.821150774 +0100
-@@ -141,8 +141,12 @@
- prefix = plat_specific and EXEC_PREFIX or PREFIX
-
- if os.name == "posix":
-+ if plat_specific or standard_lib:
-+ lib = "lib64"
-+ else:
-+ lib = "lib"
- libpython = os.path.join(prefix,
-- "lib", "python" + get_python_version())
-+ lib, "python" + get_python_version())
- if standard_lib:
- return libpython
- else:
---- Python-3.4.0b1/Lib/site.py.lib64 2013-11-24 21:36:54.000000000 +0100
-+++ Python-3.4.0b1/Lib/site.py 2013-11-27 11:10:43.822150773 +0100
-@@ -304,12 +304,16 @@
- seen.add(prefix)
-
- if os.sep == '/':
-+ sitepackages.append(os.path.join(prefix, "lib64",
-+ "python" + sys.version[:3],
-+ "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib",
- "python" + sys.version[:3],
- "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
- else:
- sitepackages.append(prefix)
-+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
- if sys.platform == "darwin":
- # for framework builds *only* we add the standard Apple
---- Python-3.4.0b1/Lib/sysconfig.py.lib64 2013-11-24 21:36:54.000000000 +0100
-+++ Python-3.4.0b1/Lib/sysconfig.py 2013-11-27 11:10:43.822150773 +0100
-@@ -20,10 +20,10 @@
-
- _INSTALL_SCHEMES = {
- 'posix_prefix': {
-- 'stdlib': '{installed_base}/lib/python{py_version_short}',
-- 'platstdlib': '{platbase}/lib/python{py_version_short}',
-+ 'stdlib': '{installed_base}/lib64/python{py_version_short}',
-+ 'platstdlib': '{platbase}/lib64/python{py_version_short}',
- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
- 'include':
- '{installed_base}/include/python{py_version_short}{abiflags}',
- 'platinclude':
-@@ -61,10 +61,10 @@
- 'data': '{userbase}',
- },
- 'posix_user': {
-- 'stdlib': '{userbase}/lib/python{py_version_short}',
-- 'platstdlib': '{userbase}/lib/python{py_version_short}',
-+ 'stdlib': '{userbase}/lib64/python{py_version_short}',
-+ 'platstdlib': '{userbase}/lib64/python{py_version_short}',
- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
- 'include': '{userbase}/include/python{py_version_short}',
- 'scripts': '{userbase}/bin',
- 'data': '{userbase}',
---- Python-3.4.0b1/Lib/test/test_site.py.lib64 2013-11-24 21:36:55.000000000 +0100
-+++ Python-3.4.0b1/Lib/test/test_site.py 2013-11-27 11:10:43.822150773 +0100
-@@ -244,12 +244,15 @@
- self.assertEqual(dirs[2], wanted)
- elif os.sep == '/':
- # OS X non-framwework builds, Linux, FreeBSD, etc
-- self.assertEqual(len(dirs), 2)
-- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
-+ self.assertEqual(len(dirs), 3)
-+ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],
- 'site-packages')
- self.assertEqual(dirs[0], wanted)
-- wanted = os.path.join('xoxo', 'lib', 'site-python')
-+ wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
-+ 'site-packages')
- self.assertEqual(dirs[1], wanted)
-+ wanted = os.path.join('xoxo', 'lib', 'site-python')
-+ self.assertEqual(dirs[2], wanted)
- else:
- # other platforms
- self.assertEqual(len(dirs), 2)
---- Python-3.4.0b1/Makefile.pre.in.lib64 2013-11-27 11:10:43.814150786 +0100
-+++ Python-3.4.0b1/Makefile.pre.in 2013-11-27 11:10:43.823150771 +0100
-@@ -115,7 +115,7 @@
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/lib
-+SCRIPTDIR= $(prefix)/lib64
- ABIFLAGS= @ABIFLAGS@
-
- # Detailed destination directories
---- Python-3.4.0b1/Modules/getpath.c.lib64 2013-11-24 21:36:56.000000000 +0100
-+++ Python-3.4.0b1/Modules/getpath.c 2013-11-27 11:17:33.619449704 +0100
-@@ -122,8 +122,8 @@
- #endif
-
- #ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
-+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
- #endif
-
- #ifndef LANDMARK
-@@ -498,7 +498,7 @@
- _pythonpath = _Py_char2wchar(PYTHONPATH, NULL);
- _prefix = _Py_char2wchar(PREFIX, NULL);
- _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL);
-- lib_python = _Py_char2wchar("lib/python" VERSION, NULL);
-+ lib_python = _Py_char2wchar("lib64/python" VERSION, NULL);
-
- if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
- Py_FatalError(
-@@ -687,7 +687,7 @@
- }
- else
- wcsncpy(zip_path, _prefix, MAXPATHLEN);
-- joinpath(zip_path, L"lib/python00.zip");
-+ joinpath(zip_path, L"lib64/python00.zip");
- bufsz = wcslen(zip_path); /* Replace "00" with version */
- zip_path[bufsz - 6] = VERSION[0];
- zip_path[bufsz - 5] = VERSION[2];
-@@ -699,7 +699,7 @@
- fprintf(stderr,
- "Could not find platform dependent libraries <exec_prefix>\n");
- wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
-- joinpath(exec_prefix, L"lib/lib-dynload");
-+ joinpath(exec_prefix, L"lib64/lib-dynload");
- }
- /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
-
---- Python-3.4.0b1/setup.py.lib64 2013-11-24 21:36:56.000000000 +0100
-+++ Python-3.4.0b1/setup.py 2013-11-27 11:10:43.824150769 +0100
-@@ -441,7 +441,7 @@
- # directories (i.e. '.' and 'Include') must be first. See issue
- # 10520.
- if not cross_compiling:
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- # only change this for cross builds for 3.3, issues on Mageia
- if cross_compiling:
-@@ -718,11 +718,11 @@
- elif curses_library:
- readline_libs.append(curses_library)
- elif self.compiler.find_library_file(lib_dirs +
-- ['/usr/lib/termcap'],
-+ ['/usr/lib64/termcap'],
- 'termcap'):
- readline_libs.append('termcap')
- exts.append( Extension('readline', ['readline.c'],
-- library_dirs=['/usr/lib/termcap'],
-+ library_dirs=['/usr/lib64/termcap'],
- extra_link_args=readline_extra_link_args,
- libraries=readline_libs) )
- else:
-@@ -759,8 +759,8 @@
- if krb5_h:
- ssl_incs += krb5_h
- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-- ['/usr/local/ssl/lib',
-- '/usr/contrib/ssl/lib/'
-+ ['/usr/local/ssl/lib64',
-+ '/usr/contrib/ssl/lib64/'
- ] )
-
- if (ssl_incs is not None and
diff --git a/python3/python-3.6.0-lib64.patch b/python3/python-3.6.0-lib64.patch
new file mode 100644
index 0000000..8e9ae4e
--- /dev/null
+++ b/python3/python-3.6.0-lib64.patch
@@ -0,0 +1,188 @@
+diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
+index 9474e9c..c0ce4c6 100644
+--- a/Lib/distutils/command/install.py
++++ b/Lib/distutils/command/install.py
+@@ -30,14 +30,14 @@ WINDOWS_SCHEME = {
+ INSTALL_SCHEMES = {
+ 'unix_prefix': {
+ 'purelib': '$base/lib/python$py_version_short/site-packages',
+- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
++ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
+ 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
+ 'scripts': '$base/bin',
+ 'data' : '$base',
+ },
+ 'unix_home': {
+ 'purelib': '$base/lib/python',
+- 'platlib': '$base/lib/python',
++ 'platlib': '$base/lib64/python',
+ 'headers': '$base/include/python/$dist_name',
+ 'scripts': '$base/bin',
+ 'data' : '$base',
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index 026cca7..6d3e077 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -132,8 +132,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+ prefix = plat_specific and EXEC_PREFIX or PREFIX
+
+ if os.name == "posix":
++ if plat_specific or standard_lib:
++ lib = "lib64"
++ else:
++ lib = "lib"
+ libpython = os.path.join(prefix,
+- "lib", "python" + get_python_version())
++ lib, "python" + get_python_version())
+ if standard_lib:
+ return libpython
+ else:
+diff --git a/Lib/site.py b/Lib/site.py
+index a84e3bb..ba0d3ea 100644
+--- a/Lib/site.py
++++ b/Lib/site.py
+@@ -303,11 +303,15 @@ def getsitepackages(prefixes=None):
+ seen.add(prefix)
+
+ if os.sep == '/':
++ sitepackages.append(os.path.join(prefix, "lib64",
++ "python" + sys.version[:3],
++ "site-packages"))
+ sitepackages.append(os.path.join(prefix, "lib",
+ "python%d.%d" % sys.version_info[:2],
+ "site-packages"))
+ else:
+ sitepackages.append(prefix)
++ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
+ sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+ if sys.platform == "darwin":
+ # for framework builds *only* we add the standard Apple
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index b9bbfe5..2a5f29c 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -20,10 +20,10 @@ __all__ = [
+
+ _INSTALL_SCHEMES = {
+ 'posix_prefix': {
+- 'stdlib': '{installed_base}/lib/python{py_version_short}',
+- 'platstdlib': '{platbase}/lib/python{py_version_short}',
++ 'stdlib': '{installed_base}/lib64/python{py_version_short}',
++ 'platstdlib': '{platbase}/lib64/python{py_version_short}',
+ 'purelib': '{base}/lib/python{py_version_short}/site-packages',
+- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
++ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
+ 'include':
+ '{installed_base}/include/python{py_version_short}{abiflags}',
+ 'platinclude':
+@@ -61,10 +61,10 @@ _INSTALL_SCHEMES = {
+ 'data': '{userbase}',
+ },
+ 'posix_user': {
+- 'stdlib': '{userbase}/lib/python{py_version_short}',
+- 'platstdlib': '{userbase}/lib/python{py_version_short}',
++ 'stdlib': '{userbase}/lib64/python{py_version_short}',
++ 'platstdlib': '{userbase}/lib64/python{py_version_short}',
+ 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
+- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
++ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
+ 'include': '{userbase}/include/python{py_version_short}',
+ 'scripts': '{userbase}/bin',
+ 'data': '{userbase}',
+diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
+index f698927..bc977b5 100644
+--- a/Lib/test/test_site.py
++++ b/Lib/test/test_site.py
+@@ -248,8 +248,8 @@ class HelperFunctionsTests(unittest.TestCase):
+ self.assertEqual(dirs[1], wanted)
+ elif os.sep == '/':
+ # OS X non-framwework builds, Linux, FreeBSD, etc
+- self.assertEqual(len(dirs), 1)
+- wanted = os.path.join('xoxo', 'lib',
++ self.assertEqual(len(dirs), 2)
++ wanted = os.path.join('xoxo', 'lib64',
+ 'python%d.%d' % sys.version_info[:2],
+ 'site-packages')
+ self.assertEqual(dirs[0], wanted)
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 8fa7934..a693917 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -126,7 +126,7 @@ LIBDIR= @libdir@
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
+-SCRIPTDIR= $(prefix)/lib
++SCRIPTDIR= $(prefix)/lib64
+ ABIFLAGS= @ABIFLAGS@
+
+ # Detailed destination directories
+diff --git a/Modules/getpath.c b/Modules/getpath.c
+index 65b47a3..eaa756c 100644
+--- a/Modules/getpath.c
++++ b/Modules/getpath.c
+@@ -494,7 +494,7 @@ calculate_path(void)
+ _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
+ _prefix = Py_DecodeLocale(PREFIX, NULL);
+ _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
+- lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
++ lib_python = Py_DecodeLocale("lib64/python" VERSION, NULL);
+
+ if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
+ Py_FatalError(
+@@ -683,7 +683,7 @@ calculate_path(void)
+ }
+ else
+ wcsncpy(zip_path, _prefix, MAXPATHLEN);
+- joinpath(zip_path, L"lib/python00.zip");
++ joinpath(zip_path, L"lib64/python00.zip");
+ bufsz = wcslen(zip_path); /* Replace "00" with version */
+ zip_path[bufsz - 6] = VERSION[0];
+ zip_path[bufsz - 5] = VERSION[2];
+@@ -695,7 +695,7 @@ calculate_path(void)
+ fprintf(stderr,
+ "Could not find platform dependent libraries <exec_prefix>\n");
+ wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
+- joinpath(exec_prefix, L"lib/lib-dynload");
++ joinpath(exec_prefix, L"lib64/lib-dynload");
+ }
+ /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
+
+diff --git a/setup.py b/setup.py
+index 0f2dfc4..da37896 100644
+--- a/setup.py
++++ b/setup.py
+@@ -492,7 +492,7 @@ class PyBuildExt(build_ext):
+ # directories (i.e. '.' and 'Include') must be first. See issue
+ # 10520.
+ if not cross_compiling:
+- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
+ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ # only change this for cross builds for 3.3, issues on Mageia
+ if cross_compiling:
+@@ -780,11 +780,11 @@ class PyBuildExt(build_ext):
+ elif curses_library:
+ readline_libs.append(curses_library)
+ elif self.compiler.find_library_file(lib_dirs +
+- ['/usr/lib/termcap'],
++ ['/usr/lib64/termcap'],
+ 'termcap'):
+ readline_libs.append('termcap')
+ exts.append( Extension('readline', ['readline.c'],
+- library_dirs=['/usr/lib/termcap'],
++ library_dirs=['/usr/lib64/termcap'],
+ extra_link_args=readline_extra_link_args,
+ libraries=readline_libs) )
+ else:
+@@ -821,8 +821,8 @@ class PyBuildExt(build_ext):
+ if krb5_h:
+ ssl_incs += krb5_h
+ ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
+- ['/usr/local/ssl/lib',
+- '/usr/contrib/ssl/lib/'
++ ['/usr/local/ssl/lib64',
++ '/usr/contrib/ssl/lib64/'
+ ] )
+
+ if (ssl_incs is not None and
diff --git a/python3/python3.nm b/python3/python3.nm
index 26343d5..cc26941 100644
--- a/python3/python3.nm
+++ b/python3/python3.nm
@@ -4,9 +4,9 @@
###############################################################################
name = python3
-major_ver = 3.4
-version = %{major_ver}.3
-release = 2
+major_ver = 3.6
+version = %{major_ver}.0
+release = 1
thisapp = Python-%{version}
groups = Development/Languages
@@ -63,7 +63,7 @@ build
prepare_cmds
if [ "%{lib}" = "lib64" ]; then
- patch -Np1 -i %{DIR_SOURCE}/python-3.4.3-lib64.patch
+ patch -Np1 -i %{DIR_SOURCE}/python-3.6.0-lib64.patch
fi
# Remove embedded copies of expat and libffi
@@ -86,24 +86,24 @@ build
--enable-shared \
--without-ensurepip
- #test
- # LD_LIBRARY_PATH=$(pwd) $(pwd)/python \
- # -m test.regrtest \
- # --verbose \
- # --findleaks \
- # -x test_distutils \
- # -x test_faulthandler \
- # -x test_gdb \
- # -x test_email \
- # -x test_subprocess \
- # -x test_float \
- # -x test_cmath \
- # -x test_asynchat \
- # -x test_asyncore
- #
+ test
+ LD_LIBRARY_PATH=$(pwd) $(pwd)/python \
+ -m test.regrtest \
+ --verbose \
+ --findleaks \
+ -x test_distutils \
+ -x test_faulthandler \
+ -x test_gdb \
+ -x test_email \
+ -x test_subprocess \
+ -x test_float \
+ -x test_cmath \
+ -x test_asynchat \
+ -x test_asyncore
+
# # test_subprocess won't work on grsecurity-enabled kernels
# # test_float and test_cmath do not work on armv5tel (soft FPU)
- #end
+ end
install_cmds
install -d -m 0755 %{BUILDROOT}%{pylibdir}/site-packages/__pycache__
diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm
index 5041e50..f773112 100644
--- a/xfsprogs/xfsprogs.nm
+++ b/xfsprogs/xfsprogs.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xfsprogs
-version = 4.7.0
+version = 4.9.0
release = 1
groups = System/Filesystems
@@ -16,7 +16,8 @@ description
A set of commands to use the XFS filesystem, including mkfs.xfs.
end
-source_dl = ftp://oss.sgi.com/projects/xfs/cmd_tars/
+source_dl = https://www.kernel.org/pub/linux/utils/fs/xfs/%{name}/
+sources = %{thisapp}.tar.xz
build
requires
@@ -37,6 +38,8 @@ build
make_build_targets += \
V=1 DEBUG=-DNDEBUG
+ # This package does not come with a testsuite.
+
make_install_targets += \
install-dev V=1 DIST_ROOT=%{BUILDROOT} \
PKG_ROOT_SBIN_DIR=%{sbindir} PKG_ROOT_LIB_DIR=%{libdir}
diff --git a/zlib/zlib.nm b/zlib/zlib.nm
index 6c7fc3c..e4f9306 100644
--- a/zlib/zlib.nm
+++ b/zlib/zlib.nm
@@ -4,7 +4,7 @@
###############################################################################
name = zlib
-version = 1.2.8
+version = 1.2.11
release = 1
groups = System/Libraries
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-01-23 13:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-23 13:14 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9d0ed61c8c0bb9d197fc5c5844d77a92073906ee git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox