From 3c22868579e4aa54e7591326c861d2a78033f032 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Sun, 12 Jan 2020 03:11:38 +0300 Subject: [PATCH 01/15] nspr fix --- system/base/nspr/actions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/base/nspr/actions.py b/system/base/nspr/actions.py index e5d6dc7d..4cc7ff49 100644 --- a/system/base/nspr/actions.py +++ b/system/base/nspr/actions.py @@ -9,6 +9,8 @@ from pisi.actionsapi import get from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools +NoStrip = ["/usr/lib"] + def setup(): # -fno-strict-aliasing workarounds some aliasing violations, see: https://bugzilla.redhat.com/show_bug.cgi?id=487844 --> shelltools.system('nspr/configure \ From 9e0a7c46a9d610573368ff396bde373449bf5b23 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sun, 12 Jan 2020 06:51:05 +0300 Subject: [PATCH 02/15] kernel_build_fix.patch --- system/base/pisi/files/kernel_build_fix.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/system/base/pisi/files/kernel_build_fix.patch b/system/base/pisi/files/kernel_build_fix.patch index 19547fa8..f77cf77d 100644 --- a/system/base/pisi/files/kernel_build_fix.patch +++ b/system/base/pisi/files/kernel_build_fix.patch @@ -1,14 +1,15 @@ -diff --git a/pisi/actionsapi/kerneltools.py b/pisi/actionsapi/kerneltools.py -index df3de3b..2560b47 100644 ---- a/pisi/actionsapi/kerneltools.py -+++ b/pisi/actionsapi/kerneltools.py -@@ -253,6 +253,9 @@ def installLibcHeaders(excludes=None): - # Create directories +diff -Nuar a/pisi/actionsapi/kerneltools.py b/pisi/actionsapi/kerneltools.py +--- a/pisi/actionsapi/kerneltools.py 2020-01-10 04:21:15.000000000 +0300 ++++ b/pisi/actionsapi/kerneltools.py 2020-01-12 00:11:45.464966486 +0300 +@@ -254,7 +254,11 @@ shelltools.makedirs(headers_tmp) shelltools.makedirs(headers_dir) -+ + + # Clean up the source directory + autotools.make('mrproper') - ++ # install the headers ++ autotools.make("%s defconfig" % make_cmd) autotools.rawInstall(make_cmd, "headers_install") + + oldwd = os.getcwd() From 314a3b0dcdd32c59bab5d6788783f39030d22342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Safa=20Ar=C4=B1man?= Date: Sun, 12 Jan 2020 13:09:27 +0300 Subject: [PATCH 03/15] pisi rebuild --- system/base/pisi/files/kernel_build_fix.patch | 15 --------------- system/base/pisi/pspec.xml | 12 ++++++++---- 2 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 system/base/pisi/files/kernel_build_fix.patch diff --git a/system/base/pisi/files/kernel_build_fix.patch b/system/base/pisi/files/kernel_build_fix.patch deleted file mode 100644 index f77cf77d..00000000 --- a/system/base/pisi/files/kernel_build_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nuar a/pisi/actionsapi/kerneltools.py b/pisi/actionsapi/kerneltools.py ---- a/pisi/actionsapi/kerneltools.py 2020-01-10 04:21:15.000000000 +0300 -+++ b/pisi/actionsapi/kerneltools.py 2020-01-12 00:11:45.464966486 +0300 -@@ -254,7 +254,11 @@ - shelltools.makedirs(headers_tmp) - shelltools.makedirs(headers_dir) - -+ # Clean up the source directory -+ autotools.make('mrproper') -+ - # install the headers -+ autotools.make("%s defconfig" % make_cmd) - autotools.rawInstall(make_cmd, "headers_install") - - oldwd = os.getcwd() diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml index 037c2166..b866c08d 100644 --- a/system/base/pisi/pspec.xml +++ b/system/base/pisi/pspec.xml @@ -12,7 +12,7 @@ app:console PISI is the package management system of Pisi Linux PISI is a modern package management system implemented in Python. Some of its main features are: package sources are written in XML and python, implements all functions through a simple-to-use API, integrates low-level and high-level package management features. - https://github.com/PisiLinuxNew/pisi/archive/v2.7.1.tar.gz + https://github.com/PisiLinuxNew/pisi/archive/v2.7.1.tar.gz comar plyvel @@ -22,9 +22,6 @@ intltool leveldb-devel - - kernel_build_fix.patch - @@ -74,6 +71,13 @@ + + 2020-01-10 + 2.7.1 + Rebuild + Safa Arıman + safa@ariman.gen.tr + 2020-01-10 2.7.1 From 7676ffc4d389a3b4aba0854f79c38bf424c775de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Safa=20Ar=C4=B1man?= Date: Sun, 12 Jan 2020 13:20:03 +0300 Subject: [PATCH 04/15] kernel rebuild --- kernel/kernel/pspec.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index c5f9d483..353260e6 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -94,6 +94,17 @@ + + 2020-01-12 + 5.4.10 + Rebuild + security + + systemRestart + + Safa Arıman + safa@ariman.gen.tr + 2020-01-10 5.4.10 From 1d2ba6509376b7557e876ee3213cfa0c8538cc34 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sun, 12 Jan 2020 18:28:08 +0300 Subject: [PATCH 05/15] test --- kernel/drivers/ndiswrapper/pspec.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/drivers/ndiswrapper/pspec.xml b/kernel/drivers/ndiswrapper/pspec.xml index d265f155..01d236a6 100644 --- a/kernel/drivers/ndiswrapper/pspec.xml +++ b/kernel/drivers/ndiswrapper/pspec.xml @@ -18,6 +18,7 @@ dkms.conf + kernel-headers kernel-module-headers From 88af7adabf7552ab38aef20fc776ca95a9f6bddc Mon Sep 17 00:00:00 2001 From: Rmys Date: Sun, 12 Jan 2020 18:32:45 +0300 Subject: [PATCH 06/15] ndiswrapper --- kernel/drivers/ndiswrapper/pspec.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/drivers/ndiswrapper/pspec.xml b/kernel/drivers/ndiswrapper/pspec.xml index 01d236a6..d265f155 100644 --- a/kernel/drivers/ndiswrapper/pspec.xml +++ b/kernel/drivers/ndiswrapper/pspec.xml @@ -18,7 +18,6 @@ dkms.conf - kernel-headers kernel-module-headers From e2a3b59bcf10705f8b1f8ebe86fe461ac9a934f2 Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 13 Jan 2020 20:43:59 +0300 Subject: [PATCH 07/15] zlib rebuild --- system/base/zlib/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/base/zlib/pspec.xml b/system/base/zlib/pspec.xml index 97681f0b..7a711c48 100644 --- a/system/base/zlib/pspec.xml +++ b/system/base/zlib/pspec.xml @@ -93,7 +93,7 @@ 2019-12-11 1.2.11 - Rebuild + Rebuild. İdris Kalp idriskalp@gmail.com From 16d579a786b55645ed92a9d4cb402551510c4d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Safa=20Ar=C4=B1man?= Date: Mon, 13 Jan 2020 22:07:02 +0300 Subject: [PATCH 08/15] pisi and file updated to newer version --- system/base/file/actions.py | 3 ++ system/base/file/files/git_fixes.patch | 66 -------------------------- system/base/file/pspec.xml | 13 +++-- system/base/pisi/pspec.xml | 9 +++- 4 files changed, 19 insertions(+), 72 deletions(-) delete mode 100644 system/base/file/files/git_fixes.patch diff --git a/system/base/file/actions.py b/system/base/file/actions.py index 12791965..02f3b9cd 100644 --- a/system/base/file/actions.py +++ b/system/base/file/actions.py @@ -10,6 +10,7 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools from pisi.actionsapi import pythonmodules + def setup(): pisitools.flags.add("-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC") @@ -19,9 +20,11 @@ def setup(): pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + def build(): autotools.make() + def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/system/base/file/files/git_fixes.patch b/system/base/file/files/git_fixes.patch deleted file mode 100644 index beec1b05..00000000 --- a/system/base/file/files/git_fixes.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -aur file-5.18/ChangeLog file.git/ChangeLog ---- file-5.18/ChangeLog 2014-03-26 16:27:39.000000000 +0100 -+++ file.git/ChangeLog 2014-04-03 18:50:06.066659023 +0200 -@@ -1,3 +1,7 @@ -+2014-04-01 15:25 Christos Zoulas -+ -+ * PR/341: Jan Kaluza, fix memory leak -+ * PR/342: Jan Kaluza, fix out of bounds read - 2014-03-26 11:25 Christos Zoulas - - * release 5.18 -diff -aur file-5.18/src/apprentice.c file.git/src/apprentice.c ---- file-5.18/src/apprentice.c 2014-03-14 19:48:11.000000000 +0100 -+++ file.git/src/apprentice.c 2014-04-03 18:50:06.086659024 +0200 -@@ -517,14 +517,18 @@ - { - if (map == NULL) - return; -- if (map->p == NULL) -- return; -+ if (map->p != NULL) { - #ifdef QUICK -- if (map->len) -- (void)munmap(map->p, map->len); -- else -+ if (map->len) -+ (void)munmap(map->p, map->len); -+ else - #endif - free(map->p); -+ } else { -+ uint32_t j; -+ for (j = 0; j < MAGIC_SETS; j++) -+ free(map->magic[j]); -+ } - free(map); - } - -@@ -1290,11 +1294,7 @@ - magic_entry_free(mset[j].me, mset[j].count); - - if (errs) { -- for (j = 0; j < MAGIC_SETS; j++) { -- if (map->magic[j]) -- free(map->magic[j]); -- } -- free(map); -+ apprentice_unmap(map); - return NULL; - } - return map; -diff -aur file-5.18/python/magic.py file.git/python/magic.py ---- file-5.18/python/magic.py 2014-04-04 20:34:38.086623965 +0200 -+++ file.git/python/magic.py 2014-04-04 20:35:42.886623752 +0200 -@@ -116,7 +116,10 @@ - is set. A call to errno() will return the numeric error code. - """ - try: # attempt python3 approach first -- bi = bytes(filename, 'utf-8') -+ if isinstance(filename, bytes): -+ bi = filename -+ else: -+ bi = bytes(filename, 'utf-8') - return str(_file(self._magic_t, bi), 'utf-8') - except: - return _file(self._magic_t, filename.encode('utf-8')) diff --git a/system/base/file/pspec.xml b/system/base/file/pspec.xml index 492313c3..f319de6e 100644 --- a/system/base/file/pspec.xml +++ b/system/base/file/pspec.xml @@ -12,17 +12,13 @@ app:console Program to identify a file's format by scanning binary data for patterns Program to identify a file's format by scanning binary data for patterns. - ftp://ftp.astron.com/pub/file/file-5.37.tar.gz - + ftp://ftp.astron.com/pub/file/file-5.38.tar.gz zlib-devel python-setuptools - @@ -42,6 +38,13 @@ + + 2020-01-13 + 5.38 + Version bump + Safa Arıman + safa@ariman.gen.tr + 2019-12-11 5.37 diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml index b866c08d..b1672049 100644 --- a/system/base/pisi/pspec.xml +++ b/system/base/pisi/pspec.xml @@ -12,7 +12,7 @@ app:console PISI is the package management system of Pisi Linux PISI is a modern package management system implemented in Python. Some of its main features are: package sources are written in XML and python, implements all functions through a simple-to-use API, integrates low-level and high-level package management features. - https://github.com/PisiLinuxNew/pisi/archive/v2.7.1.tar.gz + https://github.com/PisiLinuxNew/pisi/archive/v2.7.2.tar.gz comar plyvel @@ -71,6 +71,13 @@ + + 2020-01-13 + 2.7.2 + Version bump + Safa Arıman + safa@ariman.gen.tr + 2020-01-10 2.7.1 From 53072dfc27f852b160989f12608c5c60b7c503af Mon Sep 17 00:00:00 2001 From: Kamil ATLI Date: Mon, 13 Jan 2020 23:17:40 +0300 Subject: [PATCH 09/15] xz --- system/base/xz/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/base/xz/pspec.xml b/system/base/xz/pspec.xml index ad488ede..3d53634b 100644 --- a/system/base/xz/pspec.xml +++ b/system/base/xz/pspec.xml @@ -69,7 +69,7 @@ - + 2019-12-11 5.2.4 Version bump From 9681a54142ee4b95ce4baaa43131d790acc0504f Mon Sep 17 00:00:00 2001 From: Kamil ATLI Date: Mon, 13 Jan 2020 23:26:54 +0300 Subject: [PATCH 10/15] libunwind --- system/base/libunwind/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/base/libunwind/pspec.xml b/system/base/libunwind/pspec.xml index 4a1bf798..760093fc 100644 --- a/system/base/libunwind/pspec.xml +++ b/system/base/libunwind/pspec.xml @@ -61,7 +61,7 @@ - + 2019-12-27 1.3.1 Version bump From 3b78550fa73d64bd1d6789439744f9af7b46b1ed Mon Sep 17 00:00:00 2001 From: Kamil ATLI Date: Mon, 13 Jan 2020 23:29:25 +0300 Subject: [PATCH 11/15] plyvel --- system/base/plyvel/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/base/plyvel/pspec.xml b/system/base/plyvel/pspec.xml index 3b0fe162..784e275e 100644 --- a/system/base/plyvel/pspec.xml +++ b/system/base/plyvel/pspec.xml @@ -31,7 +31,7 @@ - + 2019-12-27 0.9 Rebuild From 33222666f4abe302872a1963899bc2eadf6b47ba Mon Sep 17 00:00:00 2001 From: Kamil ATLI Date: Mon, 13 Jan 2020 23:30:10 +0300 Subject: [PATCH 12/15] leveldb --- system/base/leveldb/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/base/leveldb/pspec.xml b/system/base/leveldb/pspec.xml index 78cd0a24..f8983138 100644 --- a/system/base/leveldb/pspec.xml +++ b/system/base/leveldb/pspec.xml @@ -42,7 +42,7 @@ - + 2019-12-27 1.18 Rebuild From cb8efe4d326653a2d81395f9bdd3339654e64ab5 Mon Sep 17 00:00:00 2001 From: suvari Date: Mon, 13 Jan 2020 23:42:03 +0300 Subject: [PATCH 13/15] kernel-module-headers: add kernel --- kernel/kernel/pspec.xml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index 52cda742..2e292394 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -28,17 +28,17 @@ zlib-devel xz-devel openssl-devel - rsync + rsync elfutils-devel patches/linux/patch-5.4.10.xz - patches/mageia/fs-aufs-5.4.patch - patches/mageia/fs-aufs-5.4-modular.patch - patches/mageia/fs-vboxsf.patch - patches/mageia/CVE-2019-12379.patch + patches/mageia/fs-aufs-5.4.patch + patches/mageia/fs-aufs-5.4-modular.patch + patches/mageia/fs-vboxsf.patch + patches/mageia/CVE-2019-12379.patch @@ -68,6 +68,9 @@ kernel-module-headers Kernel header files for external module building kernel-module-headers includes the C header files and the necessary Kbuild files for being able to build external kernel modules. + + kernel + /usr/src/linux-headers* /tmp-headers* @@ -95,7 +98,7 @@ - 2020-01-12 + 2020-01-13 5.4.10 Rebuild security @@ -421,4 +424,4 @@ ertugrulerata@gmail.com - + \ No newline at end of file From f3314b5da0ac273e38e963f3c1a13492c99fea1e Mon Sep 17 00:00:00 2001 From: Kamil ATLI Date: Mon, 13 Jan 2020 23:42:28 +0300 Subject: [PATCH 14/15] pisi --- system/base/pisi/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml index b1672049..b4a33eeb 100644 --- a/system/base/pisi/pspec.xml +++ b/system/base/pisi/pspec.xml @@ -74,7 +74,7 @@ 2020-01-13 2.7.2 - Version bump + Version bump. Safa Arıman safa@ariman.gen.tr From 64195d8a9fe24c7f015851a386c0f88121f4d43f Mon Sep 17 00:00:00 2001 From: Kamil ATLI Date: Tue, 14 Jan 2020 05:06:07 +0300 Subject: [PATCH 15/15] linux-firmware --- hardware/firmware/linux-firmware/pspec.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hardware/firmware/linux-firmware/pspec.xml b/hardware/firmware/linux-firmware/pspec.xml index 2d8fb5eb..d1d2bf4b 100644 --- a/hardware/firmware/linux-firmware/pspec.xml +++ b/hardware/firmware/linux-firmware/pspec.xml @@ -17,7 +17,6 @@ data Firmware files used by the Linux kernel linux-firmware contains different firmware files required for some devices to operate correctly. - https://sourceforge.net/projects/pisilinux/files/source/linux-firmware-20191220.tar.xz http://source.pisilinux.org/common-fw/common-fw.tar.xz http://source.pisilinux.org/firmware-ipw/firmware-ipw.tar.xz @@ -49,7 +48,7 @@ - + 2019-12-27 20191220 Update