Merge branch 'master' of ssh://git.parabola.nu/~git/abslibre

8 files changed, 50 insertions, 20 deletions

diff --git a/cross/cross-gcc/PKGBUILD b/cross/cross-gcc/PKGBUILD
index 4df7e6834..ddbdc95e5 100644
--- a/cross/cross-gcc/PKGBUILD
+++ b/cross/cross-gcc/PKGBUILD
@@ -190,6 +190,8 @@ package() {
   cd build-gcc
 
   make DESTDIR="$pkgdir" install-gcc
+  # Use the following instead if building with `make' on build()
+  #make DESTDIR="$pkgdir" install
 
   # strip target binaries
   find "$pkgdir"/usr/lib/gcc/$_target/ -type f -and \( -name \*.a -or -name \*.o \) -exec $_target-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc '{}' \;
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index cda23fc14..f89b6ed56 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgbase=linux-libre-pae
 _pkgbasever=4.17-gnu
-_pkgver=4.17.6-gnu
+_pkgver=4.17.10-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -51,7 +51,7 @@ validpgpkeys=(
 )
 sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447690e64ec0e6488a778be8a7384891c003f39029ff5799f9884482628aadf2'
             'SKIP'
-            'e87d8039431db2fc26480d2079705056638a2147e97840a331f520ad273e4a0ac57b4d939ee1fe8fff9ac8518680be21513a2a0ab7dda618ca85b603b218c22b'
+            '26e44c0cdb1236ebb7e513e0f161f0205262fa79318713b220468a931020574754231d3363523bd5ad03c2397829e6e827a2b1bf0a312379a25c8a0af9d20515'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -59,7 +59,7 @@ sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            '8455070a73a8794d51bc72809b8ffdd7e3bb51aa35441d731fbc08f641cbd462025b4a6e5573f844679e9937fda14975e3a741002dd15bee4ebec67de06ad7c0'
+            'cf8d5733a69cc7dd5318867bdd9669eb41b9f70668bc91a389d26f0bad26c1dc31b200b8111cc78aa5d00eb5899f4c6d9f9b0755daf6f65b1ed8982eaa2612cd'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index ff9d2283a..ee7b12a0d 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.2-gnu-1-pae Kernel Configuration
+# Linux/x86 4.17.10-gnu-1-pae Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -7372,7 +7372,6 @@ CONFIG_ASYNC_TX_DMA=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_AUXDISPLAY=y
-CONFIG_CHARLCD=m
 CONFIG_HD44780=m
 CONFIG_KS0108=m
 CONFIG_KS0108_PORT=0x378
@@ -7385,6 +7384,7 @@ CONFIG_PANEL=m
 CONFIG_PANEL_PARPORT=0
 CONFIG_PANEL_PROFILE=5
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
+CONFIG_CHARLCD=m
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV_GENIRQ=m
@@ -9289,7 +9289,6 @@ CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
diff --git a/kernels/linux-libre-xtreme/PKGBUILD b/kernels/linux-libre-xtreme/PKGBUILD
index 6bb59b412..6eea2e930 100644
--- a/kernels/linux-libre-xtreme/PKGBUILD
+++ b/kernels/linux-libre-xtreme/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgbase=linux-libre-xtreme
 _pkgbasever=4.17-gnu
-_pkgver=4.17.6-gnu
+_pkgver=4.17.10-gnu
 _hardenedver=a
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -22,7 +22,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
 pkgrel=1
-rcnrel=armv7-x7
+rcnrel=armv7-x10
 arch=('i686' 'x86_64' 'armv7h')
 url="https://wiki.parabola.nu/Xtreme"
 license=('GPL2')
@@ -72,9 +72,9 @@ validpgpkeys=(
 )
 sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447690e64ec0e6488a778be8a7384891c003f39029ff5799f9884482628aadf2'
             'SKIP'
-            'e87d8039431db2fc26480d2079705056638a2147e97840a331f520ad273e4a0ac57b4d939ee1fe8fff9ac8518680be21513a2a0ab7dda618ca85b603b218c22b'
+            '26e44c0cdb1236ebb7e513e0f161f0205262fa79318713b220468a931020574754231d3363523bd5ad03c2397829e6e827a2b1bf0a312379a25c8a0af9d20515'
             'SKIP'
-            '01b034b73c91290b03b39be355d818db8bb6f03d4a0632f3c149aac82a89aec10a970a21358bc2182bfa24e7d32db39bb0055e7f89a2ab47e74e0e2e6bb77165'
+            '62ff8f1236afa0131c3f7b82a5ef95e1d43856bba8ce968de6979fd9719fd4713320702ad8fc9ed880983afd80169e3f67bd9bcb1f2b3a1d3ca5473af0a01891'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -82,8 +82,8 @@ sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            '2311293cefe326467d03bdc90097af471ab0fbbc2ec073c14c407561b34a6ef8f31ee8011c1ae9f73d0bb1b736de7ea1c0c4a9781711ab30ce6264fa2da64a0f'
-            '79bb858f3843c8ea303d6005328fb28ead3aa81f4f43c5509b0072f9f7c65127e95b7ae0ff0ad48dd5dd083cb373fe7fbdea2157370ec2c7c6c9f3d4b8cb2af2'
+            '00f0d984b40e0928d9aa3d5b71beb8e6f9825ba658fffd86ce82ee3c32e7362fb96827c813bde5fdaf283e0573a22a45bebbbe2da29540586203ad5568c09c99'
+            'db27d494be852b020f71da44c88bfd93b514871b761f4220c1dd683f48ca9dd485f20bd2c37b993e27e9de185303bdbfbaa95d0881a4cacdb34b3541c57fc07b'
             '05cd4eb578374850367b75fec2599b5bed210b175a7cc23933aa6528a8cd750ef0c470ea73d9c770e8c624bf6d229b287dbc7d913e5dc1a48c976803f23fe10e'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
diff --git a/kernels/linux-libre-xtreme/config.i686 b/kernels/linux-libre-xtreme/config.i686
index 816839460..3449fae4e 100644
--- a/kernels/linux-libre-xtreme/config.i686
+++ b/kernels/linux-libre-xtreme/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.2-gnu-1-xtreme Kernel Configuration
+# Linux/x86 4.17.10-gnu-1-xtreme Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -7368,7 +7368,6 @@ CONFIG_ASYNC_TX_DMA=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_AUXDISPLAY=y
-CONFIG_CHARLCD=m
 CONFIG_HD44780=m
 CONFIG_KS0108=m
 CONFIG_KS0108_PORT=0x378
@@ -7381,6 +7380,7 @@ CONFIG_PANEL=m
 CONFIG_PANEL_PARPORT=0
 CONFIG_PANEL_PROFILE=5
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
+CONFIG_CHARLCD=m
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV_GENIRQ=m
@@ -9312,7 +9312,6 @@ CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
diff --git a/kernels/linux-libre-xtreme/config.x86_64 b/kernels/linux-libre-xtreme/config.x86_64
index 98d3c82cc..b88db292f 100644
--- a/kernels/linux-libre-xtreme/config.x86_64
+++ b/kernels/linux-libre-xtreme/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.6-gnu-1-xtreme Kernel Configuration
+# Linux/x86 4.17.10-gnu-1-xtreme Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -9277,7 +9277,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_SEED=m
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index ce96286ae..9e2b517f0 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgbase=linux-libre-lts
 _pkgbasever=4.14-gnu
-_pkgver=4.14.55-gnu
+_pkgver=4.14.58-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -68,7 +68,7 @@ validpgpkeys=(
 )
 sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e684147ebed91d1528d2685423dd784c5fca0f3650f874f2b93cfc6b7689b9a87f'
             'SKIP'
-            'eb2177160a41d204e1116a2d82b85a053f44241823926b243ff7e778dc142c6d8e1e208256c6df5f2c569591d1d938c7e1e61a1e970e258a644c09d513ac2ba1'
+            'c487e562ba51c9db9b25908be5735a08b6b76e3edfa32018a894bc9d65222ec08a8630e8a7cba0e1c51fdf51c24c6e76e852591c0000610225a0207fc496efbf'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -82,7 +82,7 @@ sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e6841
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            'e6e608e7ec0dd3ec82792875f3318cfbd83ad7bad0af51eb15aabff895d8835cc7613d6d2352525fda928929059059440da7cbe8847e58d5ec80b8a8a9313aff'
+            '34e476b4c40dab20092fdb48bacba442048fc4e752a72a11ab4d284b92132cab97afed03783010c3fecc6dcbbe89ca0fb4eea28b61cd37801a1a96ce13ca0857'
             'SKIP'
             'c6e758931e599199db07276a51b204a4030e0da80f08df60783278cf3d4d3ee6c0c280cc1788ca024cdf2043a39dd527e2205dd678368097b68240a7e80b931c'
             '3e0852e188549e60fa35b70e82740d5124936688d5f5ff0314c4e555ad9cc4c7688c56b5949baa8fd67ede22a579019919b09091b59eafac60409fdf18105af5'
diff --git a/pcr/systemd-dummy/PKGBUILD b/pcr/systemd-dummy/PKGBUILD
new file mode 100644
index 000000000..51c119db9
--- /dev/null
+++ b/pcr/systemd-dummy/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Freemor <freemor@freemor.ca>
+# Contributor: Luke Shumaker <lukeshu@parabola.nu>
+
+# https://pad.riseup.net/p/ParabolaSystemdDependants
+
+# Notes:
+# - Does *NOT* provide a specific version of systemd; if a package
+#   depends on a specific version, it probably is a "real" dependency,
+#   not an erroneous one, and satisfying it would be harmful.
+# - Does not conflicts=('systemd'); to make adding/removing notsystemd
+#   easy.
+# - Does not provide libsystemd-shared-XXX.so, nor depend on
+#   (not)systemd-common, which provide it.  That is not a public API
+#   or ABI, and no package outside of pkgbase=systemd cares about it.
+#   It's absolutely silly that Artix Linux's systemd-dummy package
+#   includes that file.
+# - Does not do anything with libsystemd.  We have more finely split
+#   packages than Arch ( (not)systemd-libsystemd / libsystemd.so).
+
+pkgname=systemd-dummy
+pkgdesc="An empty package that provides 'systemd' to satisfy packages that erronously depend on it"
+url='https://parabola.nu/'
+provides=('systemd')
+license=('custom:Public Domain')
+pkgver=1
+pkgrel=1
+arch=(any)
+
+package() {
+  :
+}