Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/ding-libs/PKGBUILD10
-rw-r--r--core/ding-libs/ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch35
-rw-r--r--core/linux/PKGBUILD2
-rw-r--r--core/linux/config.i68620
4 files changed, 60 insertions, 7 deletions
diff --git a/core/ding-libs/PKGBUILD b/core/ding-libs/PKGBUILD
new file mode 100644
index 00000000..ef562218
--- /dev/null
+++ b/core/ding-libs/PKGBUILD
@@ -0,0 +1,10 @@
+# already fixed upstream, see https://github.com/SSSD/ding-libs/issues/7
+
+source+=('ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch')
+sha1sums+=('bec66945c3524a9edf4956f794e99ca4d3d144e0')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i ../ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch
+}
diff --git a/core/ding-libs/ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch b/core/ding-libs/ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch
new file mode 100644
index 00000000..29234a70
--- /dev/null
+++ b/core/ding-libs/ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch
@@ -0,0 +1,35 @@
+diff -rauN ding-libs-0.6.1/ini/ini_validators_ut_check.c ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28-patch/ini/ini_validators_ut_check.c
+--- ding-libs-0.6.1/ini/ini_validators_ut_check.c 2017-09-07 17:24:13.000000000 +0200
++++ ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28-patch/ini/ini_validators_ut_check.c 2018-09-17 13:13:29.989999949 +0200
+@@ -602,11 +602,31 @@
+ fail_unless(ret == 0, "Got msg: [%s]", errmsg);
+ ini_errobj_next(errobj);
+
++ /* Different versions of libc produce slightly different error strings
++ * in this case. For simplicity compare against all of them. */
+ errmsg = ini_errobj_get_msg(errobj);
+ ret = strcmp(errmsg,
+ "[rule/options_for_foo]: Cannot compile regular expression "
+ "from option 'section_re'. "
+ "Error: 'Unmatched [ or [^'");
++ if (ret != 0) {
++ ret = strcmp(errmsg,
++ "[rule/options_for_foo]: Cannot compile regular expression "
++ "from option 'section_re'. "
++ "[rule/options_for_foo]: Cannot compile regular "
++ "expression from option 'section_re'. "
++ "Error: 'brackets ([ ]) not balanced'");
++ }
++ if (ret != 0) {
++ ret = strcmp(errmsg,
++ "[rule/options_for_foo]: Cannot compile regular "
++ "expression from option 'section_re'. "
++ "Error: 'Unmatched [, [^, [:, [., or [='");
++ }
++ fail_unless(ret == 0, "Got msg: [%s]", errmsg);
++ ini_errobj_next(errobj);
++
++
+ fail_unless(ret == 0, "Got msg: [%s]", errmsg);
+ ini_errobj_next(errobj);
+
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 197ec5f3..f7b7b3fb 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -4,7 +4,7 @@
for ((i=0; i<${#sha256sums[@]}; i++)); do
if [ "${sha256sums[${i}]}" = '83d768f19193f6795b8159d81c6775b9f62f4994f2a0d8371ac243e7b0890db8' ]; then
source_i686=('config.i686')
- sha256sums_i686=('224d422c6eea90fa395e49adf672a48468fd9d702f698a3ab4c9b9ee40c7cd18')
+ sha256sums_i686=('fac358ec445aaeafe13b3d5916c2c01304588578632f4d74186f8691acd0419b')
source_i486=('config.i486')
sha256sums_i486=('8bb140f3f672d6e10bfb652a617d0c161b24980c750d2358cece2b82f8897dcb')
fi
diff --git a/core/linux/config.i686 b/core/linux/config.i686
index 2b4c93f6..5e61428f 100644
--- a/core/linux/config.i686
+++ b/core/linux/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.6-arch1 Kernel Configuration
+# Linux/x86 4.18.7-arch1 Kernel Configuration
#
#
@@ -1121,14 +1121,14 @@ CONFIG_NF_NAT_REDIRECT=y
CONFIG_NETFILTER_SYNPROXY=m
CONFIG_NF_OSF=m
CONFIG_NF_TABLES=m
-# CONFIG_NF_TABLES_SET is not set
+CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m
CONFIG_NFT_FLOW_OFFLOAD=m
CONFIG_NFT_COUNTER=m
-# CONFIG_NFT_CONNLIMIT is not set
+CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
CONFIG_NFT_MASQ=m
@@ -1143,7 +1143,7 @@ CONFIG_NFT_COMPAT=m
CONFIG_NFT_HASH=m
CONFIG_NFT_FIB=m
CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SOCKET=m
CONFIG_NF_DUP_NETDEV=m
CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m
@@ -5961,7 +5961,13 @@ CONFIG_TINYDRM_MI0283QT=m
CONFIG_TINYDRM_REPAPER=m
CONFIG_TINYDRM_ST7586=m
CONFIG_TINYDRM_ST7735R=m
-# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_LEGACY=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_VIA is not set
+CONFIG_DRM_SAVAGE=m
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
#
@@ -6016,7 +6022,9 @@ CONFIG_FB_I810_I2C=y
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
# CONFIG_FB_SIS is not set
# CONFIG_FB_VIA is not set
# CONFIG_FB_NEOMAGIC is not set