From 68cd296a9a3f4a3f9ac9b63ab24d3a09a6b5e59222471c304ce22ed089e8659c Mon Sep 17 00:00:00 2001 From: Howard Guo Date: Mon, 6 Mar 2017 08:55:39 +0000 Subject: [PATCH 1/5] Accepting request 476962 from home:stroeder:branches:network update to upstream release 1.15.1 OBS-URL: https://build.opensuse.org/request/show/476962 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=183 --- krb5-1.15.1.tar.gz | 3 +++ krb5-1.15.1.tar.gz.asc | 17 +++++++++++++++++ krb5-1.15.tar.gz | 3 --- krb5-1.15.tar.gz.asc | 14 -------------- krb5-mini.changes | 14 ++++++++++++++ krb5-mini.spec | 7 ++----- krb5.changes | 14 ++++++++++++++ krb5.spec | 5 +---- 8 files changed, 51 insertions(+), 26 deletions(-) create mode 100644 krb5-1.15.1.tar.gz create mode 100644 krb5-1.15.1.tar.gz.asc delete mode 100644 krb5-1.15.tar.gz delete mode 100644 krb5-1.15.tar.gz.asc diff --git a/krb5-1.15.1.tar.gz b/krb5-1.15.1.tar.gz new file mode 100644 index 0000000..5e96d8e --- /dev/null +++ b/krb5-1.15.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:437c8831ddd5fde2a993fef425dedb48468109bb3d3261ef838295045a89eb45 +size 9375538 diff --git a/krb5-1.15.1.tar.gz.asc b/krb5-1.15.1.tar.gz.asc new file mode 100644 index 0000000..cd38b20 --- /dev/null +++ b/krb5-1.15.1.tar.gz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIVAwUAWLmTPQy6CFdfg3LfAQKWgBAAnahZbh9rFKBor8lz8icPdOAPyF7QP9xM +aDlxANUePQxN7BG68MPNL0A4/kIB1QHVl07t9vEnPBMKuF6RfVS1Sl9LYvxAF5Gf +pp5nbOOYf8bs5V/isMYjAu61D4Hyr/anKYZsbOTcR+c5CI4UXAB1uaznGcTUT+vL +MJie3ebWxJOPhv2HhkMU4BMkBxnGs1ONNsmU7yvCnbf6kgxpLaVITDzKGDrjIdQu +ej6HZQpwidUZDRICFks6pY4ASfSBEzUGswnnhdsq3uvUhxm5F6jn097K+3nIydVT +SgbJX4sBn5iJBBNumRZZ3OAovwBN+6XKM54ELWgyeQCY3Pk2P8qTojIWaqNJtyuf +q0FSR16rWKq7ZRxHwgc93YETmzIkdil5WFnTpAtqVR5RFOL/GNGh5Dwn645mC3XY +WOFBaVhX1libl+GApJjwriIzZ3e+gtaqsYa/A473BGJL+mKCp8xOfeTXeZCTCVgo +x32NhUcXTxr6RRCq/WTEH6reu4oU+VkostCv3yknHOHatYbzh2DDni+mUVnUpGw8 +WEh3XNjHrjPQ5Vr1F7/aIhmG80QXVKWfJgrVVTwUXjk8+v0enTWudsKYVanvPZDN +Yo1Jqrgc7tfRJpirVpJKxS0rNt/ES2I4heLkoz8j/DnDNqNmKV718jWVAms6jjuR +Cunhql8OvtU= +=Tvr2 +-----END PGP SIGNATURE----- diff --git a/krb5-1.15.tar.gz b/krb5-1.15.tar.gz deleted file mode 100644 index 5f5ae43..0000000 --- a/krb5-1.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd34752774c808ab4f6f864f935c49945f5a56b62240b1ad4ab1af7b4ded127c -size 9327157 diff --git a/krb5-1.15.tar.gz.asc b/krb5-1.15.tar.gz.asc deleted file mode 100644 index c34ccef..0000000 --- a/krb5-1.15.tar.gz.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQGcBAABAgAGBQJYQKmiAAoJEKMvF/0AVcMFfisL/j4xfA/HF0ElUB9X6nSboR8P -60BSDZZe38gCQyONHn1CiZA5nY7xUy45oXmtffED32NZRIq/8R0CHkSoTd+wCtev -EEGAACK0cbFMA8YDvlF5R1Hdt2Vgghr+BYGg8TbuhiZadp4I8VZ13WePR5gToaV0 -+35lOwgqRYV+Jxijp8N92KuZyZnH88tGbAh9gvPLxps2L7xA+MWwU2R71rraTIVj -b+saDBldKubh5Hamf+3Qle+lsvJuC7ErUifnjth+tpOonIlgeiLHs6+VwyHlOiv4 -i+Uf0diN/gzWZd62Y+Fl42JDevTXyschWp+HxKLkbQXley04gS0nujRLpvaDkNlR -L+4Yy873q0yS6o4x7Pmcm3nb/nJQxQyvBJMy8MjLE3pEdynFZK9o0KGBkLtNIYVt -VwlqHrTGEsOtXYQKdhq9bGvpJa4jwrR2MIDaKvR5i1zc2xtZcWkvhlKJ67FGuRRD -eSbZR00NXP2wETo7Bu8BsJR5t9/1j+4US9vA15CUQg== -=iCzw ------END PGP SIGNATURE----- diff --git a/krb5-mini.changes b/krb5-mini.changes index 548ad54..9fe3f76 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Mar 4 21:29:34 UTC 2017 - michael@stroeder.com + +- removed obsolete krb5-1.15-fix_kdb_free_principal_e_data.patch +- Upgrade to 1.15.1 + * Allow KDB modules to determine how the e_data field of principal + fields is freed + * Fix udp_preference_limit when the KDC location is configured with + SRV records + * Fix KDC and kadmind startup on some IPv4-only systems + * Fix the processing of PKINIT certificate matching rules which have + two components and no explicit relation + * Improve documentation + ------------------------------------------------------------------- Thu Jan 19 16:01:27 UTC 2017 - asn@cryptomilk.org diff --git a/krb5-mini.spec b/krb5-mini.spec index 833f35b..756c9a0 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -16,7 +16,7 @@ # -%define srcRoot krb5-1.15 +%define srcRoot krb5-1.15.1 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ %define krb5docdir %{_defaultdocdir}/krb5 @@ -29,7 +29,7 @@ BuildRequires: keyutils-devel BuildRequires: libcom_err-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel -Version: 1.15 +Version: 1.15.1 Release: 0 Summary: MIT Kerberos5 implementation and libraries with minimal dependencies License: MIT @@ -63,8 +63,6 @@ Patch8: krb5-1.12-api.patch Patch11: krb5-1.12-ksu-path.patch Patch12: krb5-1.12-selinux-label.patch Patch13: krb5-1.9-debuginfo.patch -# http://krbdev.mit.edu/rt/Ticket/Display.html?id=8538 -Patch14: krb5-1.15-fix_kdb_free_principal_e_data.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %fillup_prereq @@ -108,7 +106,6 @@ Include Files for Development %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 %build # needs to be re-generated diff --git a/krb5.changes b/krb5.changes index 6e95c90..f1a2e6c 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Mar 4 21:29:34 UTC 2017 - michael@stroeder.com + +- removed obsolete krb5-1.15-fix_kdb_free_principal_e_data.patch +- Upgrade to 1.15.1 + * Allow KDB modules to determine how the e_data field of principal + fields is freed + * Fix udp_preference_limit when the KDC location is configured with + SRV records + * Fix KDC and kadmind startup on some IPv4-only systems + * Fix the processing of PKINIT certificate matching rules which have + two components and no explicit relation + * Improve documentation + ------------------------------------------------------------------- Fri Jan 27 14:50:39 UTC 2017 - bwiedemann@suse.com diff --git a/krb5.spec b/krb5.spec index a125aa7..23168ec 100644 --- a/krb5.spec +++ b/krb5.spec @@ -25,7 +25,7 @@ BuildRequires: keyutils-devel BuildRequires: libcom_err-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel -Version: 1.15 +Version: 1.15.1 Release: 0 Summary: MIT Kerberos5 Implementation--Libraries License: MIT @@ -63,8 +63,6 @@ Patch8: krb5-1.12-api.patch Patch11: krb5-1.12-ksu-path.patch Patch12: krb5-1.12-selinux-label.patch Patch13: krb5-1.9-debuginfo.patch -# http://krbdev.mit.edu/rt/Ticket/Display.html?id=8538 -Patch14: krb5-1.15-fix_kdb_free_principal_e_data.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: mktemp, grep, /bin/touch, coreutils PreReq: %fillup_prereq @@ -179,7 +177,6 @@ Include Files for Development %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 %build # needs to be re-generated From f465a11bafecdaf6bc45517e19d443cc884717d75e547f28a7f870c4db8346c2 Mon Sep 17 00:00:00 2001 From: Howard Guo Date: Mon, 6 Mar 2017 09:15:20 +0000 Subject: [PATCH 2/5] redownload source tar archive, delete obsolete patch file OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=184 --- krb5-1.15-fix_kdb_free_principal_e_data.patch | 206 ------------------ krb5-1.15.1.tar.gz | 4 +- 2 files changed, 2 insertions(+), 208 deletions(-) delete mode 100644 krb5-1.15-fix_kdb_free_principal_e_data.patch diff --git a/krb5-1.15-fix_kdb_free_principal_e_data.patch b/krb5-1.15-fix_kdb_free_principal_e_data.patch deleted file mode 100644 index 23843ef..0000000 --- a/krb5-1.15-fix_kdb_free_principal_e_data.patch +++ /dev/null @@ -1,206 +0,0 @@ -From 28ca91cd71ea64c62419e996c38031bdae01f908 Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Wed, 18 Jan 2017 11:40:49 -0500 -Subject: [PATCH 1/2] Explicitly copy KDB vtable fields - -In preparation for bumping the kdb_vftabl minor version, use explicit -field assignments when copying the module vtable to the internal copy, -so that we can conditionalize assignments for minor versions greater -than 0. - -ticket: 8538 ---- - src/lib/kdb/kdb5.c | 81 +++++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 59 insertions(+), 22 deletions(-) - -diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c -index a3139a7dce..ee41272312 100644 ---- a/src/lib/kdb/kdb5.c -+++ b/src/lib/kdb/kdb5.c -@@ -283,24 +283,63 @@ clean_n_exit: - } - - static void --kdb_setup_opt_functions(db_library lib) --{ -- if (lib->vftabl.fetch_master_key == NULL) -- lib->vftabl.fetch_master_key = krb5_db_def_fetch_mkey; -- if (lib->vftabl.fetch_master_key_list == NULL) -- lib->vftabl.fetch_master_key_list = krb5_def_fetch_mkey_list; -- if (lib->vftabl.store_master_key_list == NULL) -- lib->vftabl.store_master_key_list = krb5_def_store_mkey_list; -- if (lib->vftabl.dbe_search_enctype == NULL) -- lib->vftabl.dbe_search_enctype = krb5_dbe_def_search_enctype; -- if (lib->vftabl.change_pwd == NULL) -- lib->vftabl.change_pwd = krb5_dbe_def_cpw; -- if (lib->vftabl.decrypt_key_data == NULL) -- lib->vftabl.decrypt_key_data = krb5_dbe_def_decrypt_key_data; -- if (lib->vftabl.encrypt_key_data == NULL) -- lib->vftabl.encrypt_key_data = krb5_dbe_def_encrypt_key_data; -- if (lib->vftabl.rename_principal == NULL) -- lib->vftabl.rename_principal = krb5_db_def_rename_principal; -+copy_vtable(const kdb_vftabl *in, kdb_vftabl *out) -+{ -+ /* Copy fields for minor version 0. */ -+ out->maj_ver = in->maj_ver; -+ out->min_ver = in->min_ver; -+ out->init_library = in->init_library; -+ out->fini_library = in->fini_library; -+ out->init_module = in->init_module; -+ out->fini_module = in->fini_module; -+ out->create = in->create; -+ out->destroy = in->destroy; -+ out->get_age = in->get_age; -+ out->lock = in->lock; -+ out->unlock = in->unlock; -+ out->get_principal = in->get_principal; -+ out->put_principal = in->put_principal; -+ out->delete_principal = in->delete_principal; -+ out->rename_principal = in->rename_principal; -+ out->iterate = in->iterate; -+ out->create_policy = in->create_policy; -+ out->get_policy = in->get_policy; -+ out->put_policy = in->put_policy; -+ out->iter_policy = in->iter_policy; -+ out->delete_policy = in->delete_policy; -+ out->fetch_master_key = in->fetch_master_key; -+ out->fetch_master_key_list = in->fetch_master_key_list; -+ out->store_master_key_list = in->store_master_key_list; -+ out->dbe_search_enctype = in->dbe_search_enctype; -+ out->change_pwd = in->change_pwd; -+ out->promote_db = in->promote_db; -+ out->decrypt_key_data = in->decrypt_key_data; -+ out->encrypt_key_data = in->encrypt_key_data; -+ out->sign_authdata = in->sign_authdata; -+ out->check_transited_realms = in->check_transited_realms; -+ out->check_policy_as = in->check_policy_as; -+ out->check_policy_tgs = in->check_policy_tgs; -+ out->audit_as_req = in->audit_as_req; -+ out->refresh_config = in->refresh_config; -+ out->check_allowed_to_delegate = in->check_allowed_to_delegate; -+ -+ /* Set defaults for optional fields. */ -+ if (out->fetch_master_key == NULL) -+ out->fetch_master_key = krb5_db_def_fetch_mkey; -+ if (out->fetch_master_key_list == NULL) -+ out->fetch_master_key_list = krb5_def_fetch_mkey_list; -+ if (out->store_master_key_list == NULL) -+ out->store_master_key_list = krb5_def_store_mkey_list; -+ if (out->dbe_search_enctype == NULL) -+ out->dbe_search_enctype = krb5_dbe_def_search_enctype; -+ if (out->change_pwd == NULL) -+ out->change_pwd = krb5_dbe_def_cpw; -+ if (out->decrypt_key_data == NULL) -+ out->decrypt_key_data = krb5_dbe_def_decrypt_key_data; -+ if (out->encrypt_key_data == NULL) -+ out->encrypt_key_data = krb5_dbe_def_encrypt_key_data; -+ if (out->rename_principal == NULL) -+ out->rename_principal = krb5_db_def_rename_principal; - } - - #ifdef STATIC_PLUGINS -@@ -334,8 +373,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *libptr) - return ENOMEM; - - strlcpy(lib->name, lib_name, sizeof(lib->name)); -- memcpy(&lib->vftabl, vftabl_addr, sizeof(kdb_vftabl)); -- kdb_setup_opt_functions(lib); -+ copy_vtable(vftabl_addr, &lib->vftabl); - - status = lib->vftabl.init_library(); - if (status) -@@ -433,8 +471,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *lib) - goto clean_n_exit; - } - -- memcpy(&(*lib)->vftabl, vftabl_addrs[0], sizeof(kdb_vftabl)); -- kdb_setup_opt_functions(*lib); -+ copy_vtable(vftabl_addrs[0], &(*lib)->vftabl); - - if ((status = (*lib)->vftabl.init_library())) - goto clean_n_exit; --- -2.11.0 - - -From 82a163b99f1f6228f98b433892444372b18ecdb3 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Wed, 18 Jan 2017 11:52:48 +0100 -Subject: [PATCH 2/2] Add free_principal_e_data KDB method - -Add an optional method to kdb_vftabl to free e_data pointer in a -principal entry, in case it was populated by a module using a more -complex structure than a single memory region. - -[ghudson@mit.edu: handled minor version bump; simplified code; rewrote -commit message] - -ticket: 8538 -target_version: 1.15-next -tags: pullup ---- - src/include/kdb.h | 11 +++++++++++ - src/lib/kdb/kdb5.c | 14 +++++++++++++- - 2 files changed, 24 insertions(+), 1 deletion(-) - -diff --git a/src/include/kdb.h b/src/include/kdb.h -index e9d1a84ba1..da04724fce 100644 ---- a/src/include/kdb.h -+++ b/src/include/kdb.h -@@ -1382,6 +1382,17 @@ typedef struct _kdb_vftabl { - krb5_const_principal client, - const krb5_db_entry *server, - krb5_const_principal proxy); -+ -+ /* End of minor version 0. */ -+ -+ /* -+ * Optional: Free the e_data pointer of a database entry. If this method -+ * is not implemented, the e_data pointer in principal entries will be -+ * freed with free() as seen by libkdb5. -+ */ -+ void (*free_principal_e_data)(krb5_context kcontext, krb5_octet *e_data); -+ -+ /* End of minor version 1 for major version 6. */ - } kdb_vftabl; - - #endif /* !defined(_WIN32) */ -diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c -index ee41272312..4adf0fcbb2 100644 ---- a/src/lib/kdb/kdb5.c -+++ b/src/lib/kdb/kdb5.c -@@ -323,6 +323,12 @@ copy_vtable(const kdb_vftabl *in, kdb_vftabl *out) - out->refresh_config = in->refresh_config; - out->check_allowed_to_delegate = in->check_allowed_to_delegate; - -+ /* Copy fields for minor version 1 (major version 6). */ -+ assert(KRB5_KDB_DAL_MAJOR_VERSION == 6); -+ out->free_principal_e_data = NULL; -+ if (in->min_ver >= 1) -+ out->free_principal_e_data = in->free_principal_e_data; -+ - /* Set defaults for optional fields. */ - if (out->fetch_master_key == NULL) - out->fetch_master_key = krb5_db_def_fetch_mkey; -@@ -820,11 +826,17 @@ free_tl_data(krb5_tl_data *list) - void - krb5_db_free_principal(krb5_context kcontext, krb5_db_entry *entry) - { -+ kdb_vftabl *v; - int i; - - if (entry == NULL) - return; -- free(entry->e_data); -+ if (entry->e_data != NULL) { -+ if (get_vftabl(kcontext, &v) == 0 && v->free_principal_e_data != NULL) -+ v->free_principal_e_data(kcontext, entry->e_data); -+ else -+ free(entry->e_data); -+ } - krb5_free_principal(kcontext, entry->princ); - free_tl_data(entry->tl_data); - for (i = 0; i < entry->n_key_data; i++) --- -2.11.0 - diff --git a/krb5-1.15.1.tar.gz b/krb5-1.15.1.tar.gz index 5e96d8e..a876a70 100644 --- a/krb5-1.15.1.tar.gz +++ b/krb5-1.15.1.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:437c8831ddd5fde2a993fef425dedb48468109bb3d3261ef838295045a89eb45 -size 9375538 +oid sha256:71b8073db274c6e2332d47db03fa58582f7b0e92514126388f018e849b2fbd66 +size 45998080 From fcf9fee442fbc257147e7db26effdcbc24e34f91affdad77837aa9d760491e17 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 9 Mar 2017 18:20:50 +0000 Subject: [PATCH 3/5] Accepting request 478007 from home:gladiac:branches:network This is a new source code upload with the krb5.keyring updated The keyring missed Greg Hudson his gpg signature: C4493CB739F4A89F9852CBC20CBA08575F8372DF The command to create the keyring is: gpg2 --export --export-options export-minimal \ 2C732B1C0DBEF678AB3AF606A32F17FD0055C305 \ C4493CB739F4A89F9852CBC20CBA08575F8372DF > krb5.keyring OBS-URL: https://build.opensuse.org/request/show/478007 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=185 --- krb5-1.15.1.tar.gz | 4 ++-- krb5.keyring | Bin 4459 -> 3900 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/krb5-1.15.1.tar.gz b/krb5-1.15.1.tar.gz index a876a70..5e96d8e 100644 --- a/krb5-1.15.1.tar.gz +++ b/krb5-1.15.1.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71b8073db274c6e2332d47db03fa58582f7b0e92514126388f018e849b2fbd66 -size 45998080 +oid sha256:437c8831ddd5fde2a993fef425dedb48468109bb3d3261ef838295045a89eb45 +size 9375538 diff --git a/krb5.keyring b/krb5.keyring index f13592c558183768edc321911911252c39416d0ecad3e32f349873e0caf8711d..bfb9bd67d16bfdaddebef281952a578f5467acbaf364ec98eba919a84db55115 100644 GIT binary patch literal 3900 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 literal 4459 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 WzyAXNu2NM4|9zBjI{SZqQT_)*WwtT^ From 353b1c8ae7ad01b02664b43d5d581128e3611a6b3c4d994cd64a3d2105b60724 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 9 Mar 2017 18:22:08 +0000 Subject: [PATCH 4/5] - use source urls. OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=186 --- krb5-mini.changes | 6 ++++++ krb5-mini.spec | 5 ++--- krb5.changes | 6 ++++++ krb5.spec | 5 ++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/krb5-mini.changes b/krb5-mini.changes index 9fe3f76..bd9cd6a 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 9 16:31:41 UTC 2017 - meissner@suse.com + +- use source urls. +- krb5.keyring: Added Greg Hudson + ------------------------------------------------------------------- Sat Mar 4 21:29:34 UTC 2017 - michael@stroeder.com diff --git a/krb5-mini.spec b/krb5-mini.spec index 756c9a0..9843b75 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -47,9 +47,8 @@ Conflicts: krb5-server Conflicts: krb5-plugin-kdb-ldap Conflicts: krb5-plugin-preauth-pkinit Conflicts: krb5-plugin-preauth-otp -# both tar.gz and .tar.gz.asc extracted from the http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar -Source0: krb5-%{version}.tar.gz -Source1: krb5-%{version}.tar.gz.asc +Source0: http://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz +Source1: http://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz.asc Source2: krb5.keyring Source3: vendor-files.tar.bz2 Source4: baselibs.conf diff --git a/krb5.changes b/krb5.changes index f1a2e6c..57a2ffd 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 9 16:31:41 UTC 2017 - meissner@suse.com + +- use source urls. +- krb5.keyring: Added Greg Hudson + ------------------------------------------------------------------- Sat Mar 4 21:29:34 UTC 2017 - michael@stroeder.com diff --git a/krb5.spec b/krb5.spec index 23168ec..224d20e 100644 --- a/krb5.spec +++ b/krb5.spec @@ -46,9 +46,8 @@ BuildRequires: pkgconfig(systemd) Obsoletes: krb5-64bit %endif Conflicts: krb5-mini -# both tar.gz and .tar.gz.asc extracted from the http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar -Source0: krb5-%{version}.tar.gz -Source1: krb5-%{version}.tar.gz.asc +Source0: http://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz +Source1: http://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz.asc Source2: krb5.keyring Source3: vendor-files.tar.bz2 Source4: baselibs.conf From 4205fb7129a5015b724d67a71eab03e9eda71aea094af40bfd5fcc3b71129fc0 Mon Sep 17 00:00:00 2001 From: Howard Guo Date: Mon, 13 Mar 2017 08:48:12 +0000 Subject: [PATCH 5/5] Accepting request 478048 from home:stroeder:branches:network use HTTPS project and source URLs OBS-URL: https://build.opensuse.org/request/show/478048 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=187 --- krb5-mini.changes | 5 +++++ krb5-mini.spec | 6 +++--- krb5.changes | 5 +++++ krb5.spec | 6 +++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/krb5-mini.changes b/krb5-mini.changes index bd9cd6a..8f01284 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 9 20:58:42 UTC 2017 - michael@stroeder.com + +- use HTTPS project and source URLs + ------------------------------------------------------------------- Thu Mar 9 16:31:41 UTC 2017 - meissner@suse.com diff --git a/krb5-mini.spec b/krb5-mini.spec index 9843b75..abffc0d 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -21,7 +21,7 @@ %define krb5docdir %{_defaultdocdir}/krb5 Name: krb5-mini -Url: http://web.mit.edu/kerberos/www/ +Url: https://web.mit.edu/kerberos/www/ BuildRequires: autoconf BuildRequires: bison BuildRequires: keyutils @@ -47,8 +47,8 @@ Conflicts: krb5-server Conflicts: krb5-plugin-kdb-ldap Conflicts: krb5-plugin-preauth-pkinit Conflicts: krb5-plugin-preauth-otp -Source0: http://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz -Source1: http://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz.asc +Source0: https://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz +Source1: https://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz.asc Source2: krb5.keyring Source3: vendor-files.tar.bz2 Source4: baselibs.conf diff --git a/krb5.changes b/krb5.changes index 57a2ffd..ac23885 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 9 20:58:42 UTC 2017 - michael@stroeder.com + +- use HTTPS project and source URLs + ------------------------------------------------------------------- Thu Mar 9 16:31:41 UTC 2017 - meissner@suse.com diff --git a/krb5.spec b/krb5.spec index 224d20e..2af3c55 100644 --- a/krb5.spec +++ b/krb5.spec @@ -17,7 +17,7 @@ Name: krb5 -Url: http://web.mit.edu/kerberos/www/ +Url: https://web.mit.edu/kerberos/www/ BuildRequires: autoconf BuildRequires: bison BuildRequires: keyutils @@ -46,8 +46,8 @@ BuildRequires: pkgconfig(systemd) Obsoletes: krb5-64bit %endif Conflicts: krb5-mini -Source0: http://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz -Source1: http://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz.asc +Source0: https://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz +Source1: https://web.mit.edu/kerberos/dist/krb5/1.15/krb5-%{version}.tar.gz.asc Source2: krb5.keyring Source3: vendor-files.tar.bz2 Source4: baselibs.conf