mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 13:07:13 +08:00
Merge branch 'testing' of code.chakralinux.org:packages/core into testing
This commit is contained in:
almack
commit
4653b7c893
@ -85,6 +85,7 @@ breeze-icons
|
||||
prison
|
||||
purpose
|
||||
kholidays
|
||||
syndication
|
||||
|
||||
#_build_desktop_kf5_additionals="sddm-kcm"
|
||||
|
||||
|
||||
40
syndication/PKGBUILD
Normal file
40
syndication/PKGBUILD
Normal file
@ -0,0 +1,40 @@
|
||||
|
||||
pkgname=syndication
|
||||
pkgver=5.53.0
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="RSS/Atom parser library"
|
||||
arch=('x86_64')
|
||||
url="https://projects.kde.org/$pkgname"
|
||||
license=(LGPL)
|
||||
depends=(kcodecs)
|
||||
makedepends=(extra-cmake-modules doxygen qt5-tools)
|
||||
groups=(kf5)
|
||||
options=('debug')
|
||||
source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
|
||||
sha256sums=('cbe4bfbbfdd90401574a6c60463ffa08083ad14efac0d0ed888c04d85e46d27e'
|
||||
'SKIP')
|
||||
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
|
||||
|
||||
|
||||
prepare() {
|
||||
mkdir -p build
|
||||
}
|
||||
|
||||
build() {
|
||||
cd build
|
||||
cmake ../${pkgname}-${pkgver} \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DKDE_INSTALL_LIBDIR=lib \
|
||||
-DKDE_INSTALL_SYSCONFDIR=/etc \
|
||||
-DKDE_INSTALL_LIBEXECDIR=lib \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON "$@"
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd build
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
@ -5,7 +5,7 @@ pkgname=vpnc
|
||||
pkgver=0.5.3.1
|
||||
_svnver=550
|
||||
_git=6f87b0fe7b20d802a0747cc310217920047d58d3
|
||||
pkgrel=5
|
||||
pkgrel=6
|
||||
pkgdesc="VPN client for cisco3000 VPN Concentrators"
|
||||
url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
|
||||
license=('GPL')
|
||||
@ -16,13 +16,21 @@ arch=('x86_64')
|
||||
source=("$pkgname::svn+http://svn.unix-ag.uni-kl.de/vpnc/trunk/#revision=$_svnver"
|
||||
"http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/$_git:/vpnc-script"
|
||||
'vpnc.conf'
|
||||
'vpnc@.service')
|
||||
'vpnc@.service'
|
||||
'bug_799429.patch')
|
||||
md5sums=('SKIP'
|
||||
'70198474faf36a84beaa11136f6c4d9c'
|
||||
'a3f4e0cc682f437e310a1c86ae198e45'
|
||||
'09cfded435c43dd2adb5a8863bd74cfc')
|
||||
'09cfded435c43dd2adb5a8863bd74cfc'
|
||||
'14083b1cc67a517b52d617fcde6efad9')
|
||||
backup=(etc/vpnc/default.conf)
|
||||
|
||||
prepare() {
|
||||
cd $pkgname
|
||||
# http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2015-June/004160.html
|
||||
patch -Np1 -i $srcdir/bug_799429.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname
|
||||
|
||||
|
||||
64
vpnc/bug_799429.patch
Normal file
64
vpnc/bug_799429.patch
Normal file
@ -0,0 +1,64 @@
|
||||
From b81680067887b054bd0d048bc5820604796c4c6e Mon Sep 17 00:00:00 2001
|
||||
From: Jeff Layton <jeff.layton@primarydata.com>
|
||||
Date: Fri, 26 Jun 2015 12:36:13 -0400
|
||||
Subject: [PATCH] vpnc: skip parsing responder lifetime payload
|
||||
|
||||
My company upgraded its Fortigate firewall recently, and I started seeing this assertion pop when connecting to it. Looking at the debug output from vpnc, I see this:
|
||||
|
||||
PARSING PAYLOAD type: 0b (ISAKMP_PAYLOAD_N)
|
||||
next_type: 0b (ISAKMP_PAYLOAD_N)
|
||||
length: 0028
|
||||
n.doi: 00000001 (ISAKMP_DOI_IPSEC)
|
||||
n.protocol: 01 (ISAKMP_IPSEC_PROTO_ISAKMP)
|
||||
n.spi_length: 10
|
||||
n.type: 6000 (ISAKMP_N_IPSEC_RESPONDER_LIFETIME)
|
||||
n.spi: 66548f57 ce7a153b ab19c18b 851d4fbb
|
||||
n.data: 800b0001 00020004 00007080
|
||||
t.attributes.type: 000b (IKE_ATTRIB_LIFE_TYPE)
|
||||
t.attributes.u.attr_16: 0001 (IKE_LIFE_TYPE_SECONDS)
|
||||
t.attributes.type: 0002 (IKE_ATTRIB_HASH)
|
||||
t.attributes.u.lots.length: 0004
|
||||
t.attributes.u.lots.data: 00007080
|
||||
DONE PARSING PAYLOAD type: 0b (ISAKMP_PAYLOAD_N)
|
||||
|
||||
|
||||
...which makes little sense to me. The firewall is sending a
|
||||
IKE_ATTRIB_LIFE_TYPE with a value of seconds in it, but then it sends an
|
||||
attribute specifying the hash algorithm. I think this is a bug in the
|
||||
firewall code, and I've asked our IT people to report it to fortinet.
|
||||
|
||||
This patch works around the problem. In the event that we get a bogus
|
||||
responder lifetime payload that doesn't include a value for the
|
||||
lifetime, just skip parsing it instead of asserting.
|
||||
|
||||
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
|
||||
---
|
||||
vpnc.c | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vpnc.c b/vpnc.c
|
||||
index 74814a6bb493..0612859e35c6 100644
|
||||
--- a/vpnc.c
|
||||
+++ b/vpnc.c
|
||||
@@ -1203,7 +1203,17 @@ static void lifetime_ike_process(struct sa_block *s, struct isakmp_attribute *a)
|
||||
assert(a->af == isakmp_attr_16);
|
||||
assert(a->u.attr_16 == IKE_LIFE_TYPE_SECONDS || a->u.attr_16 == IKE_LIFE_TYPE_K);
|
||||
assert(a->next != NULL);
|
||||
- assert(a->next->type == IKE_ATTRIB_LIFE_DURATION);
|
||||
+
|
||||
+ /*
|
||||
+ * Workaround for broken RESPONDER_LIFETIME payload from Fortigate
|
||||
+ * firewall. If the next attribute is not the LIFE_DURATION, then
|
||||
+ * just ignore this payload and move on.
|
||||
+ */
|
||||
+ if (a->next->type != IKE_ATTRIB_LIFE_DURATION) {
|
||||
+ DEBUG(2, printf("got bogus type %d instead of IKE_ATTRIB_LIFE_DURATION. Ignoring this payload.\n",
|
||||
+ a->next->type));
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
if (a->next->af == isakmp_attr_16)
|
||||
value = a->next->u.attr_16;
|
||||
--
|
||||
2.4.3
|
||||
|
||||
Loading…
Reference in New Issue
Block a user