Commit 9d53cc22 authored by Luca Giambonini's avatar Luca Giambonini

apr-util, libmpc, licenses, p11-kit and sudo update

parent d87925d5
# Maintainer: Neophytos Kolokotronis <tetris4ATgmailDOTcom>
pkgname=apr-util
pkgver=1.5.3
pkgver=1.5.4
pkgrel=1
pkgdesc="The Apache Portable Runtime"
arch=('x86_64')
url="http://apr.apache.org/"
depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
options=('!libtool')
license=('APACHE')
source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
md5sums=('6f3417691c7a27090f36e7cf4d94b36e')
md5sums=('2202b18f269ad606d70e1864857ed93c')
build() {
cd "${srcdir}/apr-util-${pkgver}"
......
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=libmpc
pkgver=1.0.2
pkgver=1.0.3
pkgrel=1
# dash the next line if you want to skip the tests
_test=1
pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
arch=('x86_64')
url="http://www.multiprecision.org"
license=('LGPL')
depends=('mpfr>=3.1.2')
options=('!libtool')
depends=('mpfr')
install=libmpc.install
source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz{,.sig})
md5sums=('68fadff3358fb3e7976c7a398a0af4c3'
md5sums=('d6a1d5f8ddea3abd2cc3e98f58352d26'
'SKIP')
validpgpkeys=('AD17A21EF8AED8F1CC02DBD9F7D5C9BF765C61E3') # Andreas Enge
build() {
cd "${srcdir}/mpc-${pkgver}"
......
# $Id: PKGBUILD 79789 2010-05-07 13:49:02Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=licenses
pkgver=2.6
pkgrel=2
pkgver=20150428
pkgrel=1
pkgdesc="The standard licenses distribution package"
arch=('any')
license=('custom:none')
url="http://archlinux.org"
url="http://chakraos.org"
groups=('base')
source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
cc-by-3.0.txt
......@@ -33,7 +31,8 @@ source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
cpl-1.0.txt
python-2.txt
LICENSE.ralink-firmware.txt
ZopePublicLicense.txt)
ZopePublicLicense.txt
w3c.txt)
md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
'ffb24d1bbf8b83d373f0b8edc3feb0c6'
'682a5e3b03510ba46c4f566478c871bc'
......@@ -51,16 +50,17 @@ md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
'24ea4c7092233849b4394699333b5c56'
'10b9de612d532fdeeb7fe8fcd1435cc6'
'9f4337828d782bdea41f03dd2ad1b808'
'bfe1f75d606912a4111c90743d6c7325'
'b7426de1c630b269dc95ba20ea82a290'
'd09c120ca7db95ef2aeecec0cb08293b'
'a45bb1bbeed9e26b26c5763df1d3913d'
'68d59ff8306e3a9f5f1c01462c77a317'
'837b32593517ae48b9c3b5c87a5d288c'
'f083e41c43db25e18f36c91e57750b64'
'a055911c32fb4ed6e96c453ceaeba857'
'682eac07428a4e8f138bc082f090ecac'
'dc8502850eab9e1ff330a12d7ca18a19')
'dc8502850eab9e1ff330a12d7ca18a19'
'6f2095b5d61770740852873b195a4d21')
build() {
package() {
cd ${pkgdir}
mkdir -p usr/share/licenses/common
cd usr/share/licenses/common
......@@ -122,6 +122,9 @@ build() {
mkdir RUBY
cp ${srcdir}/ruby-license.txt RUBY/license.txt
mkdir W3C
cp "$srcdir"/w3c.txt W3C/license.txt
mkdir ZPL
cp ${srcdir}/ZopePublicLicense.txt ZPL/license.txt
}
W3C Software Notice and License
This work (and included software, documentation such as READMEs, or
other related items) is being provided by the copyright holders under
the following license.
License
By obtaining, using and/or copying this work, you (the licensee) agree
that you have read, understood, and will comply with the following
terms and conditions.
Permission to copy, modify, and distribute this software and its
documentation, with or without modification, for any purpose and
without fee or royalty is hereby granted, provided that you include
the following on ALL copies of the software and documentation or
portions thereof, including modifications:
- The full text of this NOTICE in a location viewable to users of
the redistributed or derivative work.
- Any pre-existing intellectual property disclaimers, notices, or
terms and conditions. If none exist, the W3C Software Short
Notice should be included (hypertext is preferred, text is
permitted) within the body of any redistributed or derivative
code.
*"W3C Software Short Notice" above links to:
www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html
- Notice of any changes or modifications to the files, including
the date changes were made. (We recommend you provide URIs to
the location from which the code is derived.)
Disclaimers
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
DOCUMENTATION.
The name and trademarks of copyright holders may NOT be used in
advertising or publicity pertaining to the software without specific,
written prior permission. Title to copyright in this software and any
associated documentation will at all times remain with copyright
holders. Notes
This version:
http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
This formulation of W3C's notice and license became active on December
31 2002. This version removes the copyright ownership notice such that
this license can be used with materials other than those owned by the
W3C, reflects that ERCIM is now a host of the W3C, includes references
to this specific dated version of the license, and removes the
ambiguous grant of "use". Otherwise, this version is the same as the
previous version and is written so as to preserve the Free Software
Foundation's assessment of GPL compatibility and OSI's certification
under the Open Source Definition.
*"previous version" above links to:
http://www.w3.org/Consortium/Legal/copyright-software-19980720
*"Free Software Foundation's assessment of GPL compatibility" links to:
http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses
*"OSI's certification" above links to:
http://opensource.org/licenses/W3C.php
*"Open Source Definition" above links to:
http://opensource.org/docs/definition.php
pkgname=p11-kit
pkgver=0.22.1
pkgver=0.23.1
pkgrel=1
pkgdesc="Library to work with PKCS#11 modules"
arch=('x86_64')
url="http://p11-glue.freedesktop.org"
license=('BSD')
depends=('glibc' 'libtasn1' 'libffi')
source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig})
md5sums=('4e9bea1106628ffb820bdad24a819fac'
'SKIP')
source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig}
libnssckbi-compat.patch)
md5sums=('96f073270c489c9a594e1c9413f42db8'
'SKIP'
'8c3f119005908cf4a3e0ef0a0a310f14')
validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
prepare() {
cd $pkgname-$pkgver
# Build and install an additional library (libnssckbi-p11-kit.so) which
# is a copy of p11-kit-trust.so but uses the same label for root certs as
# libnssckbi.so ("Builtin Object Token" instead of "Default Trust")
# https://bugs.freedesktop.org/show_bug.cgi?id=66161
patch -Np1 -i ../libnssckbi-compat.patch
autoreconf -vi
}
build() {
cd $pkgname-$pkgver
......
diff -upr p11-kit-0.23.1.orig/trust/Makefile.am p11-kit-0.23.1/trust/Makefile.am
--- p11-kit-0.23.1.orig/trust/Makefile.am 2014-11-12 12:58:50.000000000 +0200
+++ p11-kit-0.23.1/trust/Makefile.am 2015-03-30 16:43:35.275993032 +0300
@@ -61,6 +61,20 @@ p11_kit_trust_la_LDFLAGS = \
p11_kit_trust_la_SOURCES = $(TRUST_SRCS)
+libnssckbi_compatdir = $(libdir)
+libnssckbi_compat_LTLIBRARIES = \
+ libnssckbi-p11-kit.la
+
+libnssckbi_p11_kit_la_CFLAGS = \
+ -DLIBNSSCKBI_COMPAT \
+ $(p11_kit_trust_la_CFLAGS)
+
+libnssckbi_p11_kit_la_LIBADD = $(p11_kit_trust_la_LIBADD)
+
+libnssckbi_p11_kit_la_LDFLAGS = $(p11_kit_trust_la_LDFLAGS)
+
+libnssckbi_p11_kit_la_SOURCES = $(p11_kit_trust_la_SOURCES)
+
libtrust_testable_la_LDFLAGS = \
-no-undefined
diff -upr p11-kit-0.23.1.orig/trust/module.c p11-kit-0.23.1/trust/module.c
--- p11-kit-0.23.1.orig/trust/module.c 2014-12-16 12:24:01.000000000 +0200
+++ p11-kit-0.23.1/trust/module.c 2015-03-30 16:48:41.370360130 +0300
@@ -196,7 +196,11 @@ create_tokens_inlock (p11_array *tokens,
const char *label;
} labels[] = {
{ "~/", "User Trust" },
+#ifdef LIBNSSCKBI_COMPAT
+ { DATA_DIR, "Builtin Object Token" },
+#else
{ DATA_DIR, "Default Trust" },
+#endif
{ SYSCONFDIR, "System Trust" },
{ NULL },
};
@@ -521,9 +525,15 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
info->flags = CKF_TOKEN_PRESENT;
strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32);
- /* If too long, copy the first 64 characters into buffer */
- path = p11_token_get_path (token);
+#ifdef LIBNSSCKBI_COMPAT
+ /* Change description to match libnssckbi so HPKP works in Chromium */
+ if (strcmp (p11_token_get_label (token), "Builtin Object Token" ) == 0)
+ path = "NSS Builtin Objects";
+ else
+#endif
+ path = p11_token_get_path (token);
length = strlen (path);
+ /* If too long, copy the first 64 characters into buffer */
if (length > sizeof (info->slotDescription))
length = sizeof (info->slotDescription);
memset (info->slotDescription, ' ', sizeof (info->slotDescription));
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer abveritas@chakra-project.org
pkgname=sudo
_sudover=1.8.12
_sudover=1.8.13
pkgver=${_sudover/p/.p}
pkgrel=1
pkgdesc="Give certain users the ability to run some commands as root."
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://www.sudo.ws/sudo/"
license=('custom')
depends=('glibc' 'pam' 'libldap')
backup=('etc/sudoers' 'etc/pam.d/sudo')
source=("ftp://ftp.sudo.ws/pub/sudo/${pkgname}-${_sudover}.tar.gz"
sudo.tmpfiles.conf
source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
'sudo.tmpfiles.conf'
'sudo.pam')
sha1sums=('b91ce01ab4da549b14df86d011f30e23815df22b'
sha1sums=('6ee1ceaeeb7baee6340f5f5b44aa2b4253931a19'
'SKIP'
'b2a8594916f6920568cf6d7eada5684109cf5510'
'2388e362dc31cc3d7270fe1c86b6be9e6d28470d')
validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4')
build() {
cd "$srcdir/$pkgname-$_sudover"
......@@ -55,6 +54,7 @@ package() {
rmdir "$pkgdir/run/sudo"
rmdir "$pkgdir/run"
# http://bugzilla.sudo.ws/show_bug.cgi?id=689
install -Dm644 "$srcdir/sudo.tmpfiles.conf" \
"$pkgdir/usr/lib/tmpfiles.d/sudo.conf"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment