Browse code

add libdb, obsolete db, adjust libsolv dependencies

Change-Id: I76c77af9f52c9b170ea2fbfb2507c017d3355416
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5373
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Priyesh Padmavilasom authored on 2018/07/19 08:58:05
Showing 9 changed files
1 1
deleted file mode 100644
... ...
@@ -1,70 +0,0 @@
1
-Summary:	DB-6.1.26
2
-Name:		db
3
-Version:	6.1.26
4
-Release:	2%{?dist}
5
-License:	Sleepycat License
6
-URL:		https://oss.oracle.com/berkeley-db.html
7
-Source0:	http://download.oracle.com/berkeley-db/%{name}-%{version}.tar.gz
8
-%define sha1 db=5ae05c6c4a1766270fd5cfb28539e2b7a19c33b2
9
-Group:		Databases
10
-Vendor:		VMware, Inc.
11
-Distribution:	Photon
12
-%description
13
-The Berkeley DB package contains programs and utilities used by many other applications for database related functions.
14
-
15
-%package	devel
16
-Summary:	Header and development files
17
-Requires:	%{name} = %{version}
18
-%description	devel
19
-It contains the libraries and header files to create applications 
20
-
21
-%package docs
22
-Summary: DB docs
23
-Group: Databases
24
-%description docs
25
-The package contains the DB doc files
26
-
27
-%prep
28
-%setup -q
29
-%build
30
-cd build_unix
31
-../dist/configure \
32
-	--prefix=%{_prefix} \
33
-	--enable-compat185 \
34
-	--enable-dbm       \
35
-	--disable-static   \
36
-	--enable-cxx
37
-make %{?_smp_mflags}
38
-%install
39
-pushd build_unix
40
-make DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version} install
41
-popd
42
-find %{buildroot} -name '*.la' -delete
43
-%clean
44
-rm -rf %{buildroot}
45
-
46
-%files
47
-%defattr(-,root,root)
48
-%{_bindir}/*
49
-%{_libdir}/*.so
50
-
51
-%files docs
52
-%defattr(-,root,root)
53
-%{_docdir}/%{name}-%{version}/*
54
-
55
-%files devel
56
-%defattr(-,root,root)
57
-%{_includedir}/*
58
-
59
-
60
-%changelog
61
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.1.26-2
62
--	GA - Bump release of all rpms
63
-* 	Thu Jan 14 2016 Xiaolin Li <xiaolinl@vmware.com> 6.1.26-1
64
-- 	Updated to version 6.1.26
65
-* 	Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 5.3.28-2
66
--	Created devel sub-package. 
67
-*	Sun Jan 04 2015 Touseef Liaqat <tliaqat@vmware.com> 6.1.19-1
68
--	Created separated docs package. First version
69
-*	Tue Nov 25 2014 Divya Thaluru <dthaluru@vmware.com> 6.1.19-1
70
--	Initial build. First version
71 1
new file mode 100644
... ...
@@ -0,0 +1,69 @@
0
+Summary:	The Berkley DB database library for C
1
+Name:		libdb
2
+Version:	5.3.28
3
+Release:	1%{?dist}
4
+License:	BSD and LGPLv2 and Sleepycat
5
+URL:		https://oss.oracle.com/berkeley-db.html
6
+Source0:	http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
7
+%define sha1 db=fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9
8
+Group:		System/Libraries
9
+Vendor:		VMware, Inc.
10
+Distribution:	Photon
11
+Obsoletes:      db
12
+%description
13
+The Berkeley DB package contains libraries used by many other applications for database related functions.
14
+
15
+%package	devel
16
+Summary:	Header and development files
17
+Requires:	%{name} = %{version}
18
+Obsoletes:      db-devel
19
+%description	devel
20
+It contains the libraries and header files to create applications 
21
+
22
+%package        docs
23
+Summary:        DB docs
24
+Group:          Databases
25
+Obsoletes:      db-docs
26
+%description docs
27
+The package contains the DB doc files
28
+
29
+%prep
30
+%setup -q -n db-%{version}
31
+%build
32
+cd build_unix
33
+../dist/configure \
34
+	--prefix=%{_prefix} \
35
+	--enable-compat185 \
36
+	--enable-dbm       \
37
+	--disable-static
38
+make %{?_smp_mflags}
39
+%install
40
+pushd build_unix
41
+make DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version} install
42
+popd
43
+find %{buildroot} -name '*.la' -delete
44
+install -v -d -m755 %{buildroot}/%{_datadir}/licenses/
45
+install -D -m755 LICENSE %{buildroot}/%{_datadir}/licenses/LICENSE
46
+install -D -m755 README %{buildroot}/%{_datadir}/licenses/README
47
+
48
+%clean
49
+rm -rf %{buildroot}
50
+
51
+%files
52
+%defattr(-,root,root)
53
+%exclude %{_bindir}/*
54
+%{_libdir}/*.so
55
+%{_datadir}/licenses/*
56
+
57
+%files docs
58
+%defattr(-,root,root)
59
+%{_docdir}/%{name}-%{version}/*
60
+
61
+%files devel
62
+%defattr(-,root,root)
63
+%exclude %{_includedir}/db_cxx.h
64
+%{_includedir}/*
65
+
66
+%changelog
67
+*	Thu Oct 27 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.3.28-1
68
+-	Initial build. First version
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Libsolv-0.6.19
2 2
 Name:		libsolv
3 3
 Version:	0.6.19
4
-Release:	4%{?dist}
4
+Release:	5%{?dist}
5 5
 License:	BSD
6 6
 URL:		https://github.com/openSUSE/libsolv
7 7
 Source0:	https://github.com/openSUSE/libsolv/archive/%{name}-%{version}.tar.gz
... ...
@@ -9,10 +9,9 @@ Source0:	https://github.com/openSUSE/libsolv/archive/%{name}-%{version}.tar.gz
9 9
 Group:		Development/Tools
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
12
-Requires:	db
13
-Requires:	rpm
12
+Requires:	libdb
14 13
 Requires:	expat
15
-BuildRequires:	db-devel
14
+BuildRequires:	libdb-devel
16 15
 BuildRequires:	cmake
17 16
 BuildRequires:	rpm-devel
18 17
 BuildRequires:	expat
... ...
@@ -40,6 +39,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
40 40
 /usr/share/*
41 41
 %{_includedir}/*
42 42
 %changelog
43
+*   Wed Jul 18 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.19-5
44
+-   use libdb
43 45
 *   Sat Sep 30 2017 Anish Swaminathan <anishs@vmware.com> 0.6.19-4
44 46
 -   Release bump for expat version update
45 47
 *   Fri Sep 29 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.19-3
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Commonly used Mail transport agent (MTA)
2 2
 Name:           sendmail
3 3
 Version:        8.15.2
4
-Release:        12%{?dist}
4
+Release:        13%{?dist}
5 5
 URL:            http://www.sendmail.org/
6 6
 License:        GPLv2+ and GPLv3+ and LGPLv2+
7 7
 Group:          Email/Server/Library
... ...
@@ -11,11 +11,12 @@ Source0:        http://ftp.vim.org/pub/mail/sendmail/sendmail-r8/sendmail.8.15.2
11 11
 BuildRequires:	systemd
12 12
 BuildRequires:  openldap
13 13
 BuildRequires:  openssl-devel
14
-BuildRequires:  db-devel
15 14
 BuildRequires:  shadow
15
+BuildRequires:  libdb-devel
16 16
 Requires:       systemd
17 17
 Requires:       m4
18 18
 Requires:       openldap
19
+Requires:       libdb
19 20
 
20 21
 %define sha1 sendmail=5801d4b06f4e38ef228a5954a44d17636eaa5a16
21 22
 
... ...
@@ -143,6 +144,15 @@ fi
143 143
 chmod 700 /var/spool/clientmqueue
144 144
 chown smmsp:smmsp /var/spool/clientmqueue
145 145
 
146
+#regen db files
147
+for map in access auth/authinfo aliases virtusertable domaintable mailertable
148
+   do
149
+     if [ -f /etc/mail/${map} ]; then
150
+       makemap hash /etc/mail/${map}.db < /etc/mail/${map}
151
+       chmod 0644 /etc/mail/${map}.db
152
+     fi
153
+   done
154
+
146 155
 %systemd_post sendmail.service
147 156
 
148 157
 %preun
... ...
@@ -186,6 +196,8 @@ fi
186 186
 %exclude %{_sysconfdir}/mail/cf/*
187 187
 
188 188
 %changelog
189
+*	Wed Jul 18 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-13
190
+-	Update requires to use libdb and build to use libdb-devel
189 191
 *       Tue Sep 26 2017 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-12
190 192
 -       Removed duplicate configuration folder.
191 193
 *       Tue Aug 29 2017 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-11
... ...
@@ -44,7 +44,6 @@
44 44
         "cpio",
45 45
         "gzip",
46 46
         "vim",
47
-        "db",
48 47
         "tdnf",
49 48
         "rsyslog",
50 49
         "audit",
... ...
@@ -84,7 +84,6 @@
84 84
         "openssl-devel",
85 85
         "util-linux-lang",
86 86
         "util-linux-devel",
87
-        "db-docs",
88 87
         "linux-dev",
89 88
         "linux-docs",
90 89
         "mpc",
... ...
@@ -5,7 +5,7 @@
5 5
                 "systemd", "dbus", "file", "e2fsprogs", "rpm",
6 6
                 "openssh", "gdbm", "python2", "python2-libs", "python-xml", 
7 7
                 "photon-release", "photon-repos",
8
-                "sed", "grep", "cpio", "gzip", "vim", "db", "tdnf",
8
+                "sed", "grep", "cpio", "gzip", "vim", "tdnf",
9 9
                 "open-vm-tools",
10 10
                 "docker","bridge-utils",
11 11
                 "cloud-init", "tzdata",
... ...
@@ -5,7 +5,7 @@
5 5
                 "systemd", "dbus", "file", "e2fsprogs", "rpm",
6 6
                 "openssh", "gdbm", "python2", "python2-libs", "python-xml",
7 7
                 "photon-release", "photon-repos",
8
-                "sed", "grep", "cpio", "gzip", "vim", "db", "tdnf",
8
+                "sed", "grep", "cpio", "gzip", "vim", "tdnf",
9 9
                 "open-vm-tools",
10 10
                 "docker","bridge-utils",
11 11
                 "cloud-init",
... ...
@@ -7,7 +7,7 @@
7 7
                  "nss", "gpgme", "systemd", "libsolv", "coreutils", "lua", "libgpg-error",
8 8
                  "elfutils-libelf", "libcap", "glib", "glib-networking", "file", "Linux-PAM",
9 9
                  "kmod", "util-linux", "libstdc++", "attr", "zlib", "rpm", "pcre", "perl",
10
-                 "cyrus-sasl", "libsoup", "db", "hawkey", "librepo", "dracut", "libxml2-devel",
10
+                 "cyrus-sasl", "libsoup", "hawkey", "librepo", "dracut", "libxml2-devel",
11 11
                  "libarchive", "apr", "hawkey-devel", "gobject-introspection", "librepo-devel",
12 12
                  "rpm-devel", "libarchive-devel", "libgsystem", "dracut-tools", "libsoup-devel",
13 13
                  "mkinitcpio", "openldap", "postgresql", "libhif", "json-glib", "apr-util",