head	1.2;
access;
symbols
	perseant-exfatfs-base-20250801:1.2
	perseant-exfatfs-base-20240630:1.2
	perseant-exfatfs:1.2.0.2
	perseant-exfatfs-base:1.2
	cjep_sun2x-base1:1.1.1.1
	cjep_sun2x:1.1.1.1.0.6
	cjep_sun2x-base:1.1.1.1
	cjep_staticlib_x-base1:1.1.1.1
	cjep_staticlib_x:1.1.1.1.0.4
	cjep_staticlib_x-base:1.1.1.1
	phil-wifi-20200421:1.1.1.1
	phil-wifi:1.1.1.1.0.2
	phil-wifi-20200411:1.1.1.1
	phil-wifi-20200406:1.1.1.1
	libfido2-f6ab2ce65745f7f3b1bee7481623de5eaac28bb0:1.1.1.1
	YUBICO:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2021.06.17.01.15.45;	author christos;	state dead;
branches;
next	1.1;
commitid	CvDWUKt4wDnlhqXC;

1.1
date	2020.03.03.00.11.43;	author christos;	state Exp;
branches
	1.1.1.1;
next	;
commitid	C3h02fnbEJ614TYB;

1.1.1.1
date	2020.03.03.00.11.43;	author christos;	state Exp;
branches
	1.1.1.1.2.1;
next	;
commitid	C3h02fnbEJ614TYB;

1.1.1.1.2.1
date	2020.03.03.00.11.43;	author martin;	state dead;
branches;
next	1.1.1.1.2.2;
commitid	X01YhRUPVUDaec4C;

1.1.1.1.2.2
date	2020.04.13.07.46.07;	author martin;	state Exp;
branches;
next	;
commitid	X01YhRUPVUDaec4C;


desc
@@


1.2
log
@merge conflicts and update between libfido 1.5.0 and 1.7.0
@
text
@# unlock-yk
# docker run --rm --volume=/home/pedro/projects/libfido2:/workdir \
#	--volume=$(gpgconf --list-dirs socketdir):/root/.gnupg \
#	--volume=$(gpgconf --list-dirs homedir)/pubring.kbx:/root/.gnupg/pubring.kbx \
#	-it libfido2-staging --install-deps --ppa martelletto/ppa \
#	--key pedro@@yubico.com
FROM ubuntu:bionic
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get -qq update && apt-get -qq upgrade
RUN apt-get install -qq packaging-dev debian-keyring devscripts equivs gnupg python sudo
ADD https://raw.githubusercontent.com/dainnilsson/scripts/master/make-ppa /make-ppa
RUN chmod +x /make-ppa
WORKDIR /workdir
ENTRYPOINT ["/make-ppa"]
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import Yubico's libfido2 from https://github.com/Yubico/libfido2.git
@
text
@@


1.1.1.1.2.1
log
@file Dockerfile was added on branch phil-wifi on 2020-04-13 07:46:07 +0000
@
text
@d1 14
@


1.1.1.1.2.2
log
@Mostly merge changes from HEAD upto 20200411
@
text
@a0 14
# unlock-yk
# docker run --rm --volume=/home/pedro/projects/libfido2:/workdir \
#	--volume=$(gpgconf --list-dirs socketdir):/root/.gnupg \
#	--volume=$(gpgconf --list-dirs homedir)/pubring.kbx:/root/.gnupg/pubring.kbx \
#	-it libfido2-staging --install-deps --ppa martelletto/ppa \
#	--key pedro@@yubico.com
FROM ubuntu:bionic
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get -qq update && apt-get -qq upgrade
RUN apt-get install -qq packaging-dev debian-keyring devscripts equivs gnupg python sudo
ADD https://raw.githubusercontent.com/dainnilsson/scripts/master/make-ppa /make-ppa
RUN chmod +x /make-ppa
WORKDIR /workdir
ENTRYPOINT ["/make-ppa"]
@