Browse code

Porting gnupg partial fix to 1.0, Bug # 1907079

Change-Id: Ie4dd8f6adfe9e3525775f70ea8a51b0531bd354e
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3390
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

Kumar Kaushik authored on 2017/08/02 10:30:13
Showing 5 changed files
... ...
@@ -1,25 +1,28 @@
1 1
 Summary:	OpenPGP standard implementation used for encrypted communication and data storage.
2 2
 Name:		gnupg
3
-Version:	2.0.30
3
+Version:	2.1.20
4 4
 Release:	1%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		https://gnupg.org/index.html
7 7
 Group:		Applications/Cryptography.
8 8
 Source0:        https://gnupg.org/ftp/gcrypt/gnupg/%{name}-%{version}.tar.bz2
9
-%define sha1 gnupg=a9f024588c356a55e2fd413574bfb55b2e18794a
9
+%define sha1 gnupg=500ddae8e4225ae2e300934090f9b9a427b8def1
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
12 12
 BuildRequires:	zlib-devel
13 13
 BuildRequires:  bzip2-devel
14 14
 BuildRequires:  readline-devel
15
-BuildRequires:  pth
16
-BuildRequires:  pth-devel
15
+BuildRequires:  npth
16
+BuildRequires:  npth-devel
17 17
 BuildRequires:  libassuan
18 18
 BuildRequires:  libksba >= 1.0.7
19
+BuildRequires:  libgcrypt >= 1.7.0
19 20
 BuildRequires:  libgcrypt-devel
21
+BuildRequires:  libgpg-error >= 1.24
20 22
 Requires:       libksba
21
-Requires:       pth
23
+Requires:       npth
22 24
 Requires:       libassuan
25
+Requires:       pinentry
23 26
 Provides:       gpg
24 27
 
25 28
 
... ...
@@ -32,6 +35,7 @@ a command line tool with features for easy integration with other applications.
32 32
 
33 33
 %prep
34 34
 %setup -q -n %{name}-%{version}
35
+
35 36
 %build
36 37
 ./configure --prefix=%{_prefix}      \
37 38
             --sysconfdir=%{_sysconfdir} \
... ...
@@ -52,7 +56,8 @@ make DESTDIR=%{buildroot} install
52 52
 %{_datadir}/gnupg/*
53 53
 %exclude %{_infodir}/dir
54 54
 %exclude /usr/share/doc/*
55
-
56 55
 %changelog
56
+*       Mon Jul 31 2017 Kumar Kaushik <kaushikk@vmware.com> 2.1.20-1
57
+-       Updating version, fixing issue # 1907079
57 58
 *       Wed Jul 27 2016 Kumar Kaushik <kaushikk@vmware.com> 2.0.30-1
58 59
 -       Initial Build.
... ...
@@ -1,16 +1,17 @@
1 1
 Summary:	Provides IPC between GnuPG Components
2 2
 Name:		libassuan
3
-Version:	2.4.2
4
-Release:	2%{?dist}
3
+Version:	2.4.3
4
+Release:	1%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		https://www.gnupg.org/(fr)/related_software/libassuan/index.html
7 7
 Group:		Development/Libraries
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution:	Photon
10 10
 Source0:	ftp://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.bz2
11
-%define sha1 libassuan=ac1047f9764fd4a4db7dafe47640643164394db9
11
+%define sha1 libassuan=27391cf4a820b5350ea789c30661830c9a271518
12
+BuildRequires:  libgpg-error >= 1.21
12 13
 Requires:	libgpg-error >= 1.21
13
-BuildRequires:	libgpg-error >= 1.21
14
+
14 15
 %description
15 16
 The libassuan package contains an inter process communication library used by some of the other GnuPG related packages. libassuan's primary use is to allow a client to interact with a non-persistent server. libassuan is not, however, limited to use with GnuPG servers and clients. It was designed to be flexible enough to meet the demands of many transaction based environments with non-persistent servers. 
16 17
 %prep
... ...
@@ -22,6 +23,10 @@ make %{?_smp_mflags}
22 22
 make DESTDIR=%{buildroot} install
23 23
 rm %{buildroot}/%{_libdir}/*.la
24 24
 rm -rf %{buildroot}/%{_infodir}
25
+
26
+%check
27
+make %{?_smp_mflags} check
28
+
25 29
 %post	-p /sbin/ldconfig
26 30
 %postun	-p /sbin/ldconfig
27 31
 %files 
... ...
@@ -31,11 +36,13 @@ rm -rf %{buildroot}/%{_infodir}
31 31
 %{_libdir}/*.so*
32 32
 %{_datadir}/aclocal/*
33 33
 %changelog
34
+*       Mon Jul 31 2017 Kumar Kaushik <kaushikk@vmware.com> 2.4.3-1
35
+-       Updating version, fixing bug # 1907079.
34 36
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.2-2
35 37
 -	GA - Bump release of all rpms
36 38
 * 	Fri Jan 15 2016 Xiaolin Li <xiaolinl@vmware.com> 2.4.2-1
37 39
 - 	Updated to version 2.4.2
38
-*   Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 2.2.0-2
39
--   Updated group.
40
+*       Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 2.2.0-2
41
+-       Updated group.
40 42
 *	Tue Dec 30 2014 Divya Thaluru <dthaluru@vmware.com> 2.2.0-1
41 43
 	Initial version
... ...
@@ -1,13 +1,12 @@
1
-
2 1
 Summary:      	libgpg-error
3 2
 Name:         	libgpg-error
4
-Version:      	1.21
5
-Release:      	2%{?dist}
3
+Version:      	1.27
4
+Release:      	1%{?dist}
6 5
 License:      	GPLv2+
7 6
 URL:          	ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/
8 7
 Group:		Development/Libraries
9 8
 Source0:	ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/%{name}-%{version}.tar.bz2
10
-%define sha1 libgpg-error=ef1dfb2f8761f019091180596e9e638d8cc37513
9
+%define sha1 libgpg-error=a428758999ff573e62d06892e3d2c0b0f335787c
11 10
 Vendor:		VMware, Inc.
12 11
 Distribution:	Photon
13 12
 
... ...
@@ -27,12 +26,13 @@ make %{?_smp_mflags}
27 27
 make DESTDIR=%{buildroot} install
28 28
 echo $%{_libdir}
29 29
 echo $%{_bindir}
30
-#mkdir -p %{buildroot}%{_libdir}
31
-#cp %{buildroot}/usr/local/lib/* %{buildroot}%{_libdir}/
32 30
 find %{buildroot}/%{_libdir} -name '*.la' -delete
33 31
 rm -rf %{buildroot}/%{_infodir}
34 32
 %find_lang %{name}
35 33
 
34
+%check
35
+make %{?_smp_mflags} check
36
+
36 37
 %post 
37 38
 /sbin/ldconfig
38 39
 
... ...
@@ -40,16 +40,20 @@ rm -rf %{buildroot}/%{_infodir}
40 40
 /sbin/ldconfig
41 41
 
42 42
 echo %{_libdir}
43
+
43 44
 %files -f %{name}.lang
44 45
 %defattr(-,root,root)
45 46
 %{_bindir}/*
46 47
 %{_libdir}/*gpg-error.so*
47
-%{_includedir}/gpg-error.h
48
+%{_includedir}/*.h
49
+%{_datadir}/libgpg-error/errorref.txt
48 50
 %{_datadir}/aclocal/gpg-error.m4
49 51
 %{_mandir}/man1/*
50 52
 %{_datarootdir}/common-lisp/*
51 53
 
52 54
 %changelog
55
+*       Tue Aug 01 2017 Kumar Kaushik <kaushikk@vmware.com> 1.27-1
56
+-       Upgrading version, fixing bug # 1907079.
53 57
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.21-2
54 58
 -	GA - Bump release of all rpms
55 59
 * 	Fri Jan 15 2016 Xiaolin Li <xiaolinl@vmware.com> 1.21-1
56 60
new file mode 100644
... ...
@@ -0,0 +1,61 @@
0
+Summary:	The New GNU Portable Threads Library.
1
+Name:		npth
2
+Version:	1.3
3
+Release:	1%{?dist}
4
+License:	GPLv2+ and LGPLv3+
5
+URL:		https://github.com/gpg/npth
6
+Group:		System Environment/Libraries.
7
+Source0:        https://github.com/gpg/%{name}/archive/%{name}-%{version}.tar.gz 
8
+%define sha1 npth=d82a2db3c3687a427c39c741616e71be98fd351b
9
+Vendor:		VMware, Inc.
10
+Distribution:	Photon
11
+
12
+%description
13
+This is a library to provide the GNU Pth API and thus a non-preemptive threads implementation.
14
+In contrast to GNU Pth, it is based on the system's standard threads implementation. 
15
+This allows the use of libraries which are not compatible to GNU Pth.  
16
+Experience with a Windows Pth emulation showed that this is a solid way to provide
17
+a co-routine based framework.
18
+
19
+%package devel
20
+Summary:       GNU npth development header and libraries.
21
+Group:         Development/Libraries.
22
+Requires:      npth = %{version}
23
+
24
+%description devel
25
+Development package for npth.
26
+
27
+%prep
28
+%setup -qn npth-%{name}-%{version}
29
+
30
+%build
31
+./autogen.sh
32
+./configure --disable-static \
33
+           --prefix=%{_prefix}
34
+make
35
+
36
+%install
37
+make DESTDIR=%{buildroot} install
38
+find %{buildroot}%{_libdir} -name '*.la' -delete
39
+
40
+%check
41
+make %{?_smp_mflags} -k check
42
+
43
+%post -p /sbin/ldconfig
44
+
45
+%postun -p /sbin/ldconfig
46
+
47
+%files
48
+%defattr(-,root,root)
49
+%{_bindir}/*
50
+%{_libdir}/*.so*
51
+
52
+%files devel
53
+%defattr(-,root,root)
54
+%{_includedir}/*
55
+%{_libdir}/*.so
56
+%{_datadir}/aclocal/*
57
+
58
+%changelog
59
+*       Mon Jul 31 2017 Kumar Kaushik <kaushikk@vmware.com> 1.3-1
60
+-       Initial Build.
0 61
new file mode 100644
... ...
@@ -0,0 +1,42 @@
0
+Summary:	A collection of PIN or passphrase entry dialogs
1
+Name:		pinentry
2
+Version:	1.0.0
3
+Release:	1%{?dist}
4
+License:	GPLv3+
5
+URL:		https://gnupg.org/software/pinentry/index.html
6
+Group:		Applications/Cryptography.
7
+Source0:        https://gnupg.org/ftp/gcrypt/%{name}/%{name}-%{version}.tar.bz2
8
+%define sha1 pinentry=85d9ac81ebad3fb082514c505c90c39a0456f1f6
9
+Vendor:		VMware, Inc.
10
+Distribution:	Photon
11
+BuildRequires:  libassuan
12
+BuildRequires:  ncurses-devel
13
+BuildRequires:  libgpg-error
14
+
15
+%description
16
+pinentry is a small collection of dialog programs that allow GnuPG to read passphrases and PIN numbers in a secure manner.
17
+There are versions for the common GTK and Qt toolkits as well as for the text terminal (Curses).
18
+They utilize the Assuan protocol as specified in the Libassuan manual. 
19
+
20
+
21
+%prep
22
+%setup -q -n %{name}-%{version}
23
+
24
+%build
25
+./configure --prefix=%{_prefix}      \
26
+            --sysconfdir=%{_sysconfdir} \
27
+            --with-libusb=no
28
+
29
+make
30
+%install
31
+make DESTDIR=%{buildroot} install
32
+
33
+%files
34
+%defattr(-,root,root)
35
+%{_bindir}/*
36
+%{_infodir}/*
37
+%exclude %{_infodir}/dir
38
+
39
+%changelog
40
+*       Mon Jul 31 2017 Kumar Kaushik <kaushikk@vmware.com> 1.0.0-1
41
+-       Initial Build.