Commit 4c098f67 authored by Eric Vidal's avatar Eric Vidal 💬

pass to CI

parent 8f8516a1
Pipeline #155539 failed with stages
in 6 minutes
image: obarun/pkgbuild:latest
variables:
repo: "$CI_PROJECT_DIR"
pkg_name: "$CI_PROJECT_NAME"
ssh_private_key: "$SSH_PRIVATE_KEY"
ssh_known_host: "$SSH_KNOWN_HOSTS"
pkg_target: "$CI_COMMIT_REF_NAME"
# followed variable are ignored but
# need to be set
pkg_track: "branch"
pkg_address: "$CI_PROJECT_URL"
stages:
- build
- deploy
build_repo:
stage: build
script:
# you can specify the directory where find pkgbuild
# with e.g builder.sh --chdir=trunk
# you can ask to install the package after a build
# e.g builder.sh --install
- builder.sh --chdir=trunk
artifacts:
expire_in: 2 days
paths:
- "*.pkg.tar.xz"
only:
changes:
- trunk/PKGBUILD
deploy:
stage: deploy
only:
changes:
- trunk/PKGBUILD
script:
- ./deploy.sh
#!/usr/bin/bash
# Copyright (c) 2015-2019 Eric Vidal <eric@obarun.org>
# All rights reserved.
#
# This file is part of Obarun. It is subject to the license terms in
# the LICENSE file found in the top-level directory of this
# distribution.
# This file may not be copied, modified, propagated, or distributed
# except according to the terms contained in the LICENSE file.
PROG="${0}"
install=0
reset='\033[0m'
red='\033[1;31m'
green='\033[1;32m'
yellow='\033[1;33m'
bold='\033[1m'
out() {
local errno="${1}" color="${2}" msg="${@:3}"
printf "${PROG}: ${color}%s${reset}: %s\n" "${errno}" "$msg" >&1
}
out_trace() {
out "tracing" "${bold}" "${@}"
}
out_success() {
out "success" "${green}" "${@}"
}
out_warn(){
out "warning" "${yellow}" "${@}"
}
out_error(){
out "fatal" "${red}" "${@}"
}
out_usage() {
out "usage" "${reset}" "${@}"
}
die() {
out_error "${@}"
exit 111
}
extra_pkg=( "openssh" )
out_trace "Install extra packages"
pacman -Sy ${extra_pkg[@]} --noconfirm || die "Unable to install extra packages"
out_trace "Starts ssh-agent"
eval $(ssh-agent)
out_trace "Configure ssh"
mkdir -p ~/.ssh || die "Unable to create ~/.ssh directory"
echo "${ssh_private_key}"| tr -d '\r' > ~/.ssh/id_rsa
chmod 700 ~/.ssh/id_rsa || die "Unable to change permissions of ~/.ssh/id_rsa"
ssh-add ~/.ssh/id_rsa || die "Unable to add key ~/.ssh/id_rsa"
echo ${ssh_known_host} > ~/.ssh/known_hosts
out_trace "Configure git"
git config --global user.name ${GITLAB_USER_NAME}
git config --global user.email ${GITLAB_USER_EMAIL}
out_trace "Cd to /tmp"
cd /tmp
out_trace "Clone git@${CI_SERVER_HOST}:/${CI_PROJECT_PATH}.git"
git clone git@${CI_SERVER_HOST}:/${CI_PROJECT_PATH}.git || die "Unable to clone git@${CI_SERVER_HOST}:/${CI_PROJECT_PATH}.git"
out_trace "Cd to ${CI_PROJECT_NAME}"
cd ${CI_PROJECT_NAME}
out_trace "Checkout to branch ${pkg_target}"
git checkout ${pkg_target} || die "Unable to checkout to ${pkg_target}"
out_trace "Retrieve pkgver and pkgrel variables from PKGBUILD"
source trunk/PKGBUILD || die "Unable to source PKGBUILD"
out_trace "Make directory of version: ${pkgver}-${pkgrel}"
mkdir -p version/${pkgver}-${pkgrel} || die "Unable to make directory version/${pkgver}-${pkgrel}"
out_trace "Copy file from trunk to version/${pkgver}-${pkgrel}"
cp trunk/* version/${pkgver}-${pkgrel} || die "Unable to copy trunk/* to version/${pkgver}-${pkgrel}"
out_trace "Git add new file"
git add . || die "Unable to git add"
out_trace "Git commit message: upgpkg: ${pkgver}-${pkgrel}"
git commit -m "upgpkg: ${pkgver}-${pkgrel}" || die "Unable to commit"
out_trace "Push the new version"
git push --all || die "Unable to push at git@${CI_SERVER_HOST}:/${CI_PROJECT_PATH}.git"
exit 0
From ec8bb05e15640b1857b94ded128bc33ca7ec7fe0 Mon Sep 17 00:00:00 2001
Message-Id: <ec8bb05e15640b1857b94ded128bc33ca7ec7fe0.1519917784.git.jan.steffens@gmail.com>
From 8a1c9bb1170213498d3386d2a5c2882868e4f535 Mon Sep 17 00:00:00 2001
Message-Id: <8a1c9bb1170213498d3386d2a5c2882868e4f535.1548110948.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Thu, 1 Mar 2018 16:20:59 +0100
Subject: [PATCH] Build and install libnssckbi-p11-kit.so
......@@ -15,12 +15,12 @@ https://bugs.freedesktop.org/show_bug.cgi?id=66161
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/trust/Makefile.am b/trust/Makefile.am
index 6e52c4d..157a1d9 100644
index c4a65a3..303e1d0 100644
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -66,6 +66,20 @@ p11_kit_trust_la_LDFLAGS = \
p11_kit_trust_la_SOURCES = $(TRUST_SRCS)
p11_kit_trust_la_SOURCES = $(TRUST_SRCS) trust/module-init.c
+libnssckbi_compatdir = $(libdir)
+libnssckbi_compat_LTLIBRARIES = \
......@@ -40,7 +40,7 @@ index 6e52c4d..157a1d9 100644
-no-undefined
diff --git a/trust/module.c b/trust/module.c
index e8b7256..d578a90 100644
index 1722340..e776270 100644
--- a/trust/module.c
+++ b/trust/module.c
@@ -201,7 +201,11 @@ create_tokens_inlock (p11_array *tokens,
......@@ -55,9 +55,9 @@ index e8b7256..d578a90 100644
{ P11_SYSTEM_TRUST_PREFIX, "System Trust", P11_TOKEN_FLAG_NONE },
{ NULL },
};
@@ -529,8 +533,14 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
@@ -534,8 +538,14 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
info->flags = CKF_TOKEN_PRESENT;
strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32);
memcpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32);
+#ifdef LIBNSSCKBI_COMPAT
+ /* Change description to match libnssckbi so HPKP works in Chromium */
......@@ -72,4 +72,5 @@ index e8b7256..d578a90 100644
if (length > sizeof (info->slotDescription))
length = sizeof (info->slotDescription);
--
2.16.1
2.20.1
......@@ -3,7 +3,7 @@
# Contributor: Ionut Biru <ibiru@archlinux.org>
pkgname=p11-kit
pkgver=0.23.15
pkgver=0.23.16
pkgrel=2
pkgdesc="Provides a way to load and enumerate PKCS#11 modules"
arch=(x86_64)
......@@ -43,7 +43,6 @@ build() {
check() {
cd p11-kit
unset SOURCE_DATE_EPOCH
make check
}
......
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