From 728abe9baf37f98f332565f8922cd65b2d14dfd9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 23:34:33 -0500 Subject: [PATCH 01/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 7541e1a..a60867b 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.19 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://netlabel.sf.net/ @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_mandir}/man8/* %changelog +* Fri Jul 20 2012 Fedora Release Engineering - 0.19-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0.19-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 07865541b9c53f5d610f588cc97c5e16b9a52c9e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 02:12:06 -0600 Subject: [PATCH 02/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index a60867b..93f1b46 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.19 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://netlabel.sf.net/ @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_mandir}/man8/* %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.19-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Jul 20 2012 Fedora Release Engineering - 0.19-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From efd0da54bd2dd98a4d90eb975a1c6cd655802ade Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Fri, 31 May 2013 17:13:25 -0400 Subject: [PATCH 03/41] - Version bump to match latest upstream - Cleanups in the specfile due to changes in the upstream package --- netlabel_tools.spec | 72 +++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 93f1b46..5a6a96d 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,58 +1,66 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools -Version: 0.19 -Release: 12%{?dist} +Version: 0.20 +Release: 0%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://netlabel.sf.net/ Source0: http://downloads.sourceforge.net/netlabel/%{name}-%{version}.tar.gz -Source1: netlabel -Source2: netlabel.rules -Patch1: netlabel_tools-0.17-new-hdrs.patch -Patch2: netlabel_tools-0.19-return_codes.patch BuildRoot: %{_tmppath}/%{name}-%{version} -BuildRequires: kernel-headers >= 2.6.18 +Requires: kernel >= 2.6.19 +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +BuildRequires: kernel-headers >= 2.6.19 BuildRequires: libnl-devel +BuildRequires: doxygen +BuildRequires: systemd %description NetLabel is a kernel subsystem which implements explicit packet labeling -protocols such as CIPSO and RIPSO for Linux. Packet labeling is used in -secure networks to mark packets with the security attributes of the data they -contain. This package provides the necessary user space tools to query and -configure the kernel subsystem. +protocols such as CIPSO for Linux. Packet labeling is used in secure networks +to mark packets with the security attributes of the data they contain. This +package provides the necessary user space tools to query and configure the +kernel subsystem. -%prep -%setup -q -n %{name}-%{version} - -# Build fixes. -%patch1 -p1 -b .new-hdrs -%patch2 -p1 -b .rc +%prep +%setup -q %build -# Don't use _smp_mflags, it's small and a hand crafted Makefile -make +./configure --prefix="%{_prefix}" --libdir="%{_libdir}" --enable-systemd +make V=1 %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make INSTALL_PREFIX=${RPM_BUILD_ROOT} \ - INSTALL_MAN_DIR=${RPM_BUILD_ROOT}/usr/share/man \ - install -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/ -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ -install -m 0640 %{SOURCE2} $RPM_BUILD_ROOT/etc/ +rm -rf "%{buildroot}" +mkdir -p "%{buildroot}/etc" +mkdir -p "%{buildroot}/%{_sbindir}" +mkdir -p "%{buildroot}/%{_unitdir}" +mkdir -p "%{buildroot}/%{_mandir}" +make V=1 DESTDIR="%{buildroot}" install -%clean -rm -rf $RPM_BUILD_ROOT +%preun +%systemd_preun netlabel.service + +%postun +%systemd_postun + +%post +%systemd_post netlabel.service %files %defattr(-,root,root) -%doc docs/*.txt -%attr(0755,root,root) /sbin/* -%attr(0755,root,root) /etc/rc.d/init.d/netlabel -%config(noreplace) %attr(640,root,root) /etc/netlabel.rules +%doc README CHANGELOG LICENSE %attr(0644,root,root) %{_mandir}/man8/* +%attr(0755,root,root) %{_sbindir}/netlabelctl +%attr(0755,root,root) %{_sbindir}/netlabel-config +%attr(0644,root,root) %{_unitdir}/netlabel.service +%attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Mon Jun 3 2013 Paul Moore - 0.20-0 +- Version bump to match latest upstream +- Cleanups in the specfile due to changes in the upstream package + * Thu Feb 14 2013 Fedora Release Engineering - 0.19-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 713ebfe1bb8a0630bb45a8dee2a42fc9411fbada Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Mon, 3 Jun 2013 15:38:18 -0400 Subject: [PATCH 04/41] Sources for the 0.20 release --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1ceaa03..98ced20 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ netlabel_tools-0.19.tar.gz +/netlabel_tools-0.20.tar.gz diff --git a/sources b/sources index 4b0523e..fb9af35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7a9f397e5bf2364676e2beba1a61beb netlabel_tools-0.19.tar.gz +56b1a6c249fd18695d0134d1ec390cb2 netlabel_tools-0.20.tar.gz From 7245588ecca6f8bfdd4c077bd953e3b7d8b6e28a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 08:09:16 -0500 Subject: [PATCH 05/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 5a6a96d..1982724 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.20 -Release: 0%{?dist} +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://netlabel.sf.net/ @@ -57,6 +57,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.20-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Mon Jun 3 2013 Paul Moore - 0.20-0 - Version bump to match latest upstream - Cleanups in the specfile due to changes in the upstream package From 8779b02a2653237e490b66851c71e3432fef9e51 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Thu, 27 Feb 2014 15:41:49 -0500 Subject: [PATCH 06/41] - Build with CFLAGS="${optflags}" --- netlabel_tools.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 1982724..21a415e 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.20 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://netlabel.sf.net/ @@ -28,7 +28,7 @@ kernel subsystem. %build ./configure --prefix="%{_prefix}" --libdir="%{_libdir}" --enable-systemd -make V=1 %{?_smp_mflags} +CFLAGS="%{optflags}" make V=1 %{?_smp_mflags} %install rm -rf "%{buildroot}" @@ -57,6 +57,8 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Feb 27 2014 Paul Moore - 0.20-2 +- Build with CFLAGS="${optflags}" * Sat Aug 03 2013 Fedora Release Engineering - 0.20-1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From aa593225d2ff265365fc9c0b196af3ee18dc332b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 07:33:39 -0500 Subject: [PATCH 07/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 21a415e..79887c9 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.20 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://netlabel.sf.net/ @@ -57,6 +57,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Feb 27 2014 Paul Moore - 0.20-2 - Build with CFLAGS="${optflags}" * Sat Aug 03 2013 Fedora Release Engineering - 0.20-1 From e5f6debc7488be1181c1d2e703a3f3058c045d1b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 11:37:12 +0000 Subject: [PATCH 08/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 79887c9..f7ba64d 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.20 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://netlabel.sf.net/ @@ -57,6 +57,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 0.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 0a49d8afa240553b6ca3facc4a419ff0439434a7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 21 Mar 2015 13:53:08 +0000 Subject: [PATCH 09/41] Add patch to support libnl3, Use %%license, Cleanup spec --- 0001-Port-to-libnl3.patch | 222 ++++++++++++++++++++++++++++++++++++++ netlabel_tools.spec | 25 +++-- 2 files changed, 239 insertions(+), 8 deletions(-) create mode 100644 0001-Port-to-libnl3.patch diff --git a/0001-Port-to-libnl3.patch b/0001-Port-to-libnl3.patch new file mode 100644 index 0000000..e9e7f6d --- /dev/null +++ b/0001-Port-to-libnl3.patch @@ -0,0 +1,222 @@ +From d82ed2081cf58fb2504ba037d7a1e6444ec5019a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= +Date: Wed, 28 May 2014 00:11:37 -0400 +Subject: [PATCH] Port to libnl3 + +--- + libnetlabel/netlabel_comm.c | 35 ----------------------------- + libnetlabel/netlabel_internal.h | 49 +++++++---------------------------------- + libnetlabel/netlabel_msg.c | 4 ---- + macros.mk | 2 +- + netlabelctl/Makefile | 2 +- + 5 files changed, 10 insertions(+), 82 deletions(-) + +diff --git a/libnetlabel/netlabel_comm.c b/libnetlabel/netlabel_comm.c +index 289629b..02869e8 100644 +--- a/libnetlabel/netlabel_comm.c ++++ b/libnetlabel/netlabel_comm.c +@@ -102,13 +102,8 @@ struct nlbl_handle *nlbl_comm_open(void) + goto open_failure; + + /* set the netlink handle properties */ +-#if LIBNL_VERSION >= 1008 + nl_socket_set_peer_port(hndl->nl_hndl, 0); + nl_set_passcred(hndl->nl_hndl, 1); +-#elif LIBNL_VERSION == 1006 +- nl_handle_set_peer_pid(hndl->nl_hndl, 0); +- nl_set_passcred(hndl->nl_hndl, 1); +-#endif + nl_disable_sequence_check(hndl->nl_hndl); + + /* connect to the generic netlink subsystem in the kernel */ +@@ -177,11 +172,7 @@ int nlbl_comm_recv_raw(struct nlbl_handle *hndl, unsigned char **data) + * no data is waiting to be read from the handle */ + timeout.tv_sec = nlcomm_read_timeout; + timeout.tv_usec = 0; +-#if LIBNL_VERSION >= 1008 + nl_fd = nl_socket_get_fd(hndl->nl_hndl); +-#else +- nl_fd = nl_handle_get_fd(hndl->nl_hndl); +-#endif + FD_ZERO(&read_fds); + FD_SET(nl_fd, &read_fds); + ret_val = select(nl_fd + 1, &read_fds, NULL, NULL, &timeout); +@@ -192,15 +183,9 @@ int nlbl_comm_recv_raw(struct nlbl_handle *hndl, unsigned char **data) + + /* perform the read operation */ + *data = NULL; +-#if LIBNL_VERSION >= 1006 + ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data, &creds); + if (ret_val < 0) + return ret_val; +-#else +- ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data); +- if (ret_val < 0) +- return ret_val; +-#endif + + /* if we are setup to receive credentials, only accept messages from + * the kernel (ignore all others and send an -EAGAIN) */ +@@ -251,11 +236,7 @@ int nlbl_comm_recv(struct nlbl_handle *hndl, nlbl_msg **msg) + * no data is waiting to be read from the handle */ + timeout.tv_sec = nlcomm_read_timeout; + timeout.tv_usec = 0; +-#if LIBNL_VERSION >= 1008 + nl_fd = nl_socket_get_fd(hndl->nl_hndl); +-#else +- nl_fd = nl_handle_get_fd(hndl->nl_hndl); +-#endif + FD_ZERO(&read_fds); + FD_SET(nl_fd, &read_fds); + ret_val = select(nl_fd + 1, &read_fds, NULL, NULL, &timeout); +@@ -265,19 +246,9 @@ int nlbl_comm_recv(struct nlbl_handle *hndl, nlbl_msg **msg) + return -EAGAIN; + + /* perform the read operation */ +-#if LIBNL_VERSION >= 1100 + ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, &data, &creds); + if (ret_val < 0) + return ret_val; +-#elif LIBNL_VERSION >= 1006 +- ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data, &creds); +- if (ret_val < 0) +- return ret_val; +-#else +- ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data); +- if (ret_val < 0) +- return ret_val; +-#endif + + /* if we are setup to receive credentials, only accept messages from + * the kernel (ignore all others and send an -EAGAIN) */ +@@ -344,9 +315,7 @@ int nlbl_comm_send(struct nlbl_handle *hndl, nlbl_msg *msg) + creds.gid = getegid(); + + /* set the message properties */ +-#if LIBNL_VERSION >= 1006 + nlmsg_set_creds(msg, &creds); +-#endif + + /* request a netlink ack message */ + nl_hdr = nlbl_msg_nlhdr(msg); +@@ -355,9 +324,5 @@ int nlbl_comm_send(struct nlbl_handle *hndl, nlbl_msg *msg) + nl_hdr->nlmsg_flags |= NLM_F_ACK; + + /* send the message */ +-#if LIBNL_VERSION == 1005 +- return nl_send_auto_complete(hndl->nl_hndl, nlbl_msg_nlhdr(msg)); +-#elif LIBNL_VERSION >= 1006 + return nl_send_auto_complete(hndl->nl_hndl, msg); +-#endif + } +diff --git a/libnetlabel/netlabel_internal.h b/libnetlabel/netlabel_internal.h +index acc2f03..54200af 100644 +--- a/libnetlabel/netlabel_internal.h ++++ b/libnetlabel/netlabel_internal.h +@@ -27,6 +27,14 @@ + + #include + ++#define nl_handle_alloc nl_socket_alloc ++#define nl_handle_destroy nl_socket_free ++#define nl_handle nl_sock ++#define nlmsg_build(ptr) nlmsg_inherit(ptr) ++#define nl_set_passcred nl_socket_set_passcred ++#define nl_disable_sequence_check nl_socket_disable_seq_check ++#define nlmsg_len nlmsg_datalen ++ + /* NetLabel communication handle */ + struct nlbl_handle { + struct nl_handle *nl_hndl; +@@ -37,46 +45,5 @@ struct nlbl_handle { + (((hdr)->nlmsg_flags & NLM_F_MULTI) && \ + ((hdr)->nlmsg_type != NLMSG_DONE))) + +-/* Specify which version of libnl we are using */ +-/* 1.0-pre5 => 1005 */ +-/* 1.0-pre6 => 1006 */ +-/* 1.0-pre8 => 1008 */ +-/* 1.1 => 1100 */ +-#define LIBNL_VERSION 1100 +- +-/* XXX - this whole block will most likely go away once libnl supports Generic +- * Netlink */ +-#if LIBNL_VERSION <= 1006 /* Generic Netlink types */ +- +-/* Generic Netlink message header */ +-struct genlmsghdr { +- uint8_t cmd; +- uint8_t version; +- uint16_t reserved; +-}; +- +-#define GENL_ID_CTRL 0x10 +- +-enum { +- CTRL_CMD_UNSPEC, +- CTRL_CMD_NEWFAMILY, +- CTRL_CMD_DELFAMILY, +- CTRL_CMD_GETFAMILY, +- CTRL_CMD_NEWOPS, +- CTRL_CMD_DELOPS, +- CTRL_CMD_GETOPS, +- __CTRL_CMD_MAX, +-}; +-#define CTRL_CMD_MAX (__CTRL_CMD_MAX - 1) +- +-enum { +- CTRL_ATTR_UNSPEC, +- CTRL_ATTR_FAMILY_ID, +- CTRL_ATTR_FAMILY_NAME, +- __CTRL_ATTR_MAX, +-}; +-#define CTRL_ATTR_MAX (__CTRL_ATTR_MAX - 1) +- +-#endif /* Generic Netlink types */ + + #endif +diff --git a/libnetlabel/netlabel_msg.c b/libnetlabel/netlabel_msg.c +index fb2fc58..af00fbe 100644 +--- a/libnetlabel/netlabel_msg.c ++++ b/libnetlabel/netlabel_msg.c +@@ -63,11 +63,7 @@ nlbl_msg *nlbl_msg_new(void) + struct genlmsghdr genl_hdr; + + /* create the message with a simple netlink header */ +-#if LIBNL_VERSION >= 1008 + msg = nlmsg_alloc(); +-#else +- msg = nlmsg_build_no_hdr(); +-#endif + if (msg == NULL) + goto msg_new_failure; + +diff --git a/macros.mk b/macros.mk +index a9466f0..b9f8813 100644 +--- a/macros.mk ++++ b/macros.mk +@@ -53,7 +53,7 @@ CPPFLAGS += -I$(TOPDIR) -I$(TOPDIR)/include + LIBFLAGS = + + CFLAGS ?= -Wl,-z,relro -Wall -O0 -g +-CFLAGS += -fPIC ++CFLAGS += `pkg-config --cflags libnl-3.0` -fPIC + LDFLAGS ?= -z relro -g + + # +diff --git a/netlabelctl/Makefile b/netlabelctl/Makefile +index 06af6a5..07cebbb 100644 +--- a/netlabelctl/Makefile ++++ b/netlabelctl/Makefile +@@ -49,7 +49,7 @@ CONF_FILE = netlabel.rules + + OBJS = main.o mgmt.o map.o unlabeled.o cipsov4.o + +-LDFLAGS := ../libnetlabel/libnetlabel.a -lnl -lm ++LDFLAGS := ../libnetlabel/libnetlabel.a `pkg-config --libs libnl-3.0` -lm + + DEPS = $(OBJS:%.o=%.d) + +-- +1.8.4.5 + diff --git a/netlabel_tools.spec b/netlabel_tools.spec index f7ba64d..ce394ac 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -6,13 +6,15 @@ License: GPLv2 Group: System Environment/Daemons URL: http://netlabel.sf.net/ Source0: http://downloads.sourceforge.net/netlabel/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version} -Requires: kernel >= 2.6.19 +# http://sourceforge.net/p/netlabel/bugs/1/ +Patch0: 0001-Port-to-libnl3.patch + +Requires: kernel Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -BuildRequires: kernel-headers >= 2.6.19 -BuildRequires: libnl-devel +BuildRequires: kernel-headers +BuildRequires: libnl3-devel BuildRequires: doxygen BuildRequires: systemd @@ -25,13 +27,13 @@ kernel subsystem. %prep %setup -q +%patch0 -p1 -b .nl3 %build ./configure --prefix="%{_prefix}" --libdir="%{_libdir}" --enable-systemd CFLAGS="%{optflags}" make V=1 %{?_smp_mflags} %install -rm -rf "%{buildroot}" mkdir -p "%{buildroot}/etc" mkdir -p "%{buildroot}/%{_sbindir}" mkdir -p "%{buildroot}/%{_unitdir}" @@ -42,14 +44,15 @@ make V=1 DESTDIR="%{buildroot}" install %systemd_preun netlabel.service %postun -%systemd_postun +%systemd_postun netlabel.service %post %systemd_post netlabel.service %files -%defattr(-,root,root) -%doc README CHANGELOG LICENSE +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc README CHANGELOG %attr(0644,root,root) %{_mandir}/man8/* %attr(0755,root,root) %{_sbindir}/netlabelctl %attr(0755,root,root) %{_sbindir}/netlabel-config @@ -57,6 +60,11 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Sat Mar 21 2015 Peter Robinson 0.20-5 +- Add patch to support libnl3 +- Use %%license +- Cleanup spec + * Sun Aug 17 2014 Fedora Release Engineering - 0.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -65,6 +73,7 @@ make V=1 DESTDIR="%{buildroot}" install * Thu Feb 27 2014 Paul Moore - 0.20-2 - Build with CFLAGS="${optflags}" + * Sat Aug 03 2013 Fedora Release Engineering - 0.20-1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 1b76746a6170f5e850c3a555a78073471c49941f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 21 Mar 2015 14:04:47 +0000 Subject: [PATCH 10/41] actually bump release --- netlabel_tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index ce394ac..caf5feb 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.20 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://netlabel.sf.net/ From f9715e9ffc7a8bc47639f349c6c8f25c44a196e4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 21:42:22 +0000 Subject: [PATCH 11/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index caf5feb..4fa0237 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.20 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://netlabel.sf.net/ @@ -60,6 +60,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.20-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Mar 21 2015 Peter Robinson 0.20-5 - Add patch to support libnl3 - Use %%license From 1b69650ed45daef3a5bf50628ddafb5aba2f2c0e Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Fri, 10 Jul 2015 16:11:23 -0400 Subject: [PATCH 12/41] - New upstream version --- .gitignore | 1 + netlabel_tools.spec | 29 ++++++++++++++++++----------- sources | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 98ced20..c37d387 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ netlabel_tools-0.19.tar.gz /netlabel_tools-0.20.tar.gz +/netlabel_tools-0.21.tar.gz diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 4fa0237..7ac59ab 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,15 +1,13 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools -Version: 0.20 -Release: 6%{?dist} +Version: 0.21 +Release: 0%{?dist} License: GPLv2 Group: System Environment/Daemons -URL: http://netlabel.sf.net/ -Source0: http://downloads.sourceforge.net/netlabel/%{name}-%{version}.tar.gz -# http://sourceforge.net/p/netlabel/bugs/1/ -Patch0: 0001-Port-to-libnl3.patch +Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/netlabel/netlabel_tools -Requires: kernel +Requires: kernel libnl3 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -27,19 +25,23 @@ kernel subsystem. %prep %setup -q -%patch0 -p1 -b .nl3 %build -./configure --prefix="%{_prefix}" --libdir="%{_libdir}" --enable-systemd -CFLAGS="%{optflags}" make V=1 %{?_smp_mflags} +%configure +make V=1 %{?_smp_mflags} %install +rm -rf "%{buildroot}" mkdir -p "%{buildroot}/etc" mkdir -p "%{buildroot}/%{_sbindir}" mkdir -p "%{buildroot}/%{_unitdir}" mkdir -p "%{buildroot}/%{_mandir}" make V=1 DESTDIR="%{buildroot}" install +# NOTE: disable since the tests require messing with the running kernel +#%check +#make V=1 check + %preun %systemd_preun netlabel.service @@ -52,7 +54,9 @@ make V=1 DESTDIR="%{buildroot}" install %files %{!?_licensedir:%global license %%doc} %license LICENSE -%doc README CHANGELOG +%doc README +%doc CHANGELOG +%doc SUBMITTING_PATCHES %attr(0644,root,root) %{_mandir}/man8/* %attr(0755,root,root) %{_sbindir}/netlabelctl %attr(0755,root,root) %{_sbindir}/netlabel-config @@ -60,6 +64,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Fri Jul 10 2015 Paul Moore - 0.21-0 +- New upstream version + * Wed Jun 17 2015 Fedora Release Engineering - 0.20-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index fb9af35..231dfb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -56b1a6c249fd18695d0134d1ec390cb2 netlabel_tools-0.20.tar.gz +54ae1eb11a1b5201bea8a43a6fb08fc2 netlabel_tools-0.21.tar.gz From d605289d23c9a7a67c6024126890f091c3f75686 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Wed, 14 Oct 2015 15:57:30 -0400 Subject: [PATCH 13/41] Remove old patches --- 0001-Port-to-libnl3.patch | 222 ------------------------- netlabel_tools-0.17-new-hdrs.patch | 34 ---- netlabel_tools-0.19-return_codes.patch | 10 -- 3 files changed, 266 deletions(-) delete mode 100644 0001-Port-to-libnl3.patch delete mode 100644 netlabel_tools-0.17-new-hdrs.patch delete mode 100644 netlabel_tools-0.19-return_codes.patch diff --git a/0001-Port-to-libnl3.patch b/0001-Port-to-libnl3.patch deleted file mode 100644 index e9e7f6d..0000000 --- a/0001-Port-to-libnl3.patch +++ /dev/null @@ -1,222 +0,0 @@ -From d82ed2081cf58fb2504ba037d7a1e6444ec5019a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= -Date: Wed, 28 May 2014 00:11:37 -0400 -Subject: [PATCH] Port to libnl3 - ---- - libnetlabel/netlabel_comm.c | 35 ----------------------------- - libnetlabel/netlabel_internal.h | 49 +++++++---------------------------------- - libnetlabel/netlabel_msg.c | 4 ---- - macros.mk | 2 +- - netlabelctl/Makefile | 2 +- - 5 files changed, 10 insertions(+), 82 deletions(-) - -diff --git a/libnetlabel/netlabel_comm.c b/libnetlabel/netlabel_comm.c -index 289629b..02869e8 100644 ---- a/libnetlabel/netlabel_comm.c -+++ b/libnetlabel/netlabel_comm.c -@@ -102,13 +102,8 @@ struct nlbl_handle *nlbl_comm_open(void) - goto open_failure; - - /* set the netlink handle properties */ --#if LIBNL_VERSION >= 1008 - nl_socket_set_peer_port(hndl->nl_hndl, 0); - nl_set_passcred(hndl->nl_hndl, 1); --#elif LIBNL_VERSION == 1006 -- nl_handle_set_peer_pid(hndl->nl_hndl, 0); -- nl_set_passcred(hndl->nl_hndl, 1); --#endif - nl_disable_sequence_check(hndl->nl_hndl); - - /* connect to the generic netlink subsystem in the kernel */ -@@ -177,11 +172,7 @@ int nlbl_comm_recv_raw(struct nlbl_handle *hndl, unsigned char **data) - * no data is waiting to be read from the handle */ - timeout.tv_sec = nlcomm_read_timeout; - timeout.tv_usec = 0; --#if LIBNL_VERSION >= 1008 - nl_fd = nl_socket_get_fd(hndl->nl_hndl); --#else -- nl_fd = nl_handle_get_fd(hndl->nl_hndl); --#endif - FD_ZERO(&read_fds); - FD_SET(nl_fd, &read_fds); - ret_val = select(nl_fd + 1, &read_fds, NULL, NULL, &timeout); -@@ -192,15 +183,9 @@ int nlbl_comm_recv_raw(struct nlbl_handle *hndl, unsigned char **data) - - /* perform the read operation */ - *data = NULL; --#if LIBNL_VERSION >= 1006 - ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data, &creds); - if (ret_val < 0) - return ret_val; --#else -- ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data); -- if (ret_val < 0) -- return ret_val; --#endif - - /* if we are setup to receive credentials, only accept messages from - * the kernel (ignore all others and send an -EAGAIN) */ -@@ -251,11 +236,7 @@ int nlbl_comm_recv(struct nlbl_handle *hndl, nlbl_msg **msg) - * no data is waiting to be read from the handle */ - timeout.tv_sec = nlcomm_read_timeout; - timeout.tv_usec = 0; --#if LIBNL_VERSION >= 1008 - nl_fd = nl_socket_get_fd(hndl->nl_hndl); --#else -- nl_fd = nl_handle_get_fd(hndl->nl_hndl); --#endif - FD_ZERO(&read_fds); - FD_SET(nl_fd, &read_fds); - ret_val = select(nl_fd + 1, &read_fds, NULL, NULL, &timeout); -@@ -265,19 +246,9 @@ int nlbl_comm_recv(struct nlbl_handle *hndl, nlbl_msg **msg) - return -EAGAIN; - - /* perform the read operation */ --#if LIBNL_VERSION >= 1100 - ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, &data, &creds); - if (ret_val < 0) - return ret_val; --#elif LIBNL_VERSION >= 1006 -- ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data, &creds); -- if (ret_val < 0) -- return ret_val; --#else -- ret_val = nl_recv(hndl->nl_hndl, &peer_nladdr, data); -- if (ret_val < 0) -- return ret_val; --#endif - - /* if we are setup to receive credentials, only accept messages from - * the kernel (ignore all others and send an -EAGAIN) */ -@@ -344,9 +315,7 @@ int nlbl_comm_send(struct nlbl_handle *hndl, nlbl_msg *msg) - creds.gid = getegid(); - - /* set the message properties */ --#if LIBNL_VERSION >= 1006 - nlmsg_set_creds(msg, &creds); --#endif - - /* request a netlink ack message */ - nl_hdr = nlbl_msg_nlhdr(msg); -@@ -355,9 +324,5 @@ int nlbl_comm_send(struct nlbl_handle *hndl, nlbl_msg *msg) - nl_hdr->nlmsg_flags |= NLM_F_ACK; - - /* send the message */ --#if LIBNL_VERSION == 1005 -- return nl_send_auto_complete(hndl->nl_hndl, nlbl_msg_nlhdr(msg)); --#elif LIBNL_VERSION >= 1006 - return nl_send_auto_complete(hndl->nl_hndl, msg); --#endif - } -diff --git a/libnetlabel/netlabel_internal.h b/libnetlabel/netlabel_internal.h -index acc2f03..54200af 100644 ---- a/libnetlabel/netlabel_internal.h -+++ b/libnetlabel/netlabel_internal.h -@@ -27,6 +27,14 @@ - - #include - -+#define nl_handle_alloc nl_socket_alloc -+#define nl_handle_destroy nl_socket_free -+#define nl_handle nl_sock -+#define nlmsg_build(ptr) nlmsg_inherit(ptr) -+#define nl_set_passcred nl_socket_set_passcred -+#define nl_disable_sequence_check nl_socket_disable_seq_check -+#define nlmsg_len nlmsg_datalen -+ - /* NetLabel communication handle */ - struct nlbl_handle { - struct nl_handle *nl_hndl; -@@ -37,46 +45,5 @@ struct nlbl_handle { - (((hdr)->nlmsg_flags & NLM_F_MULTI) && \ - ((hdr)->nlmsg_type != NLMSG_DONE))) - --/* Specify which version of libnl we are using */ --/* 1.0-pre5 => 1005 */ --/* 1.0-pre6 => 1006 */ --/* 1.0-pre8 => 1008 */ --/* 1.1 => 1100 */ --#define LIBNL_VERSION 1100 -- --/* XXX - this whole block will most likely go away once libnl supports Generic -- * Netlink */ --#if LIBNL_VERSION <= 1006 /* Generic Netlink types */ -- --/* Generic Netlink message header */ --struct genlmsghdr { -- uint8_t cmd; -- uint8_t version; -- uint16_t reserved; --}; -- --#define GENL_ID_CTRL 0x10 -- --enum { -- CTRL_CMD_UNSPEC, -- CTRL_CMD_NEWFAMILY, -- CTRL_CMD_DELFAMILY, -- CTRL_CMD_GETFAMILY, -- CTRL_CMD_NEWOPS, -- CTRL_CMD_DELOPS, -- CTRL_CMD_GETOPS, -- __CTRL_CMD_MAX, --}; --#define CTRL_CMD_MAX (__CTRL_CMD_MAX - 1) -- --enum { -- CTRL_ATTR_UNSPEC, -- CTRL_ATTR_FAMILY_ID, -- CTRL_ATTR_FAMILY_NAME, -- __CTRL_ATTR_MAX, --}; --#define CTRL_ATTR_MAX (__CTRL_ATTR_MAX - 1) -- --#endif /* Generic Netlink types */ - - #endif -diff --git a/libnetlabel/netlabel_msg.c b/libnetlabel/netlabel_msg.c -index fb2fc58..af00fbe 100644 ---- a/libnetlabel/netlabel_msg.c -+++ b/libnetlabel/netlabel_msg.c -@@ -63,11 +63,7 @@ nlbl_msg *nlbl_msg_new(void) - struct genlmsghdr genl_hdr; - - /* create the message with a simple netlink header */ --#if LIBNL_VERSION >= 1008 - msg = nlmsg_alloc(); --#else -- msg = nlmsg_build_no_hdr(); --#endif - if (msg == NULL) - goto msg_new_failure; - -diff --git a/macros.mk b/macros.mk -index a9466f0..b9f8813 100644 ---- a/macros.mk -+++ b/macros.mk -@@ -53,7 +53,7 @@ CPPFLAGS += -I$(TOPDIR) -I$(TOPDIR)/include - LIBFLAGS = - - CFLAGS ?= -Wl,-z,relro -Wall -O0 -g --CFLAGS += -fPIC -+CFLAGS += `pkg-config --cflags libnl-3.0` -fPIC - LDFLAGS ?= -z relro -g - - # -diff --git a/netlabelctl/Makefile b/netlabelctl/Makefile -index 06af6a5..07cebbb 100644 ---- a/netlabelctl/Makefile -+++ b/netlabelctl/Makefile -@@ -49,7 +49,7 @@ CONF_FILE = netlabel.rules - - OBJS = main.o mgmt.o map.o unlabeled.o cipsov4.o - --LDFLAGS := ../libnetlabel/libnetlabel.a -lnl -lm -+LDFLAGS := ../libnetlabel/libnetlabel.a `pkg-config --libs libnl-3.0` -lm - - DEPS = $(OBJS:%.o=%.d) - --- -1.8.4.5 - diff --git a/netlabel_tools-0.17-new-hdrs.patch b/netlabel_tools-0.17-new-hdrs.patch deleted file mode 100644 index 27221c5..0000000 --- a/netlabel_tools-0.17-new-hdrs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up netlabel_tools-0.19/Makefile.new-hdrs netlabel_tools-0.19/Makefile ---- netlabel_tools-0.19/Makefile.new-hdrs 2009-01-05 22:24:24.000000000 +0100 -+++ netlabel_tools-0.19/Makefile 2010-06-16 13:36:55.170646610 +0200 -@@ -41,8 +41,9 @@ INSTALL_SBIN_DIR = $(INSTALL_PREFIX)/sbi - INSTALL_BIN_DIR = $(INSTALL_PREFIX)/bin - INSTALL_MAN_DIR = $(INSTALL_PREFIX)/share/man - --OWNER = root --GROUP = root -+# Mock doesn't allow this. -+# OWNER = root -+# GROUP = root - - # - # targets -@@ -70,15 +71,15 @@ install: $(SUBDIRS) - @echo "INFO: installing files in $(INSTALL_PREFIX)" - @mkdir -p $(INSTALL_SBIN_DIR) - @mkdir -p $(INSTALL_MAN_DIR)/man8 -- @install -o $(OWNER) -g $(GROUP) -m 755 netlabelctl/netlabelctl \ -+ @install -m 755 netlabelctl/netlabelctl \ - $(INSTALL_SBIN_DIR)/netlabelctl -- @install -o $(OWNER) -g $(GROUP) -m 644 docs/man/netlabelctl.8 \ -+ @install -m 644 docs/man/netlabelctl.8 \ - $(INSTALL_MAN_DIR)/man8 - - $(VERSION_HDR): version_info - @echo "INFO: creating the version header file" - @hdr="$(VERSION_HDR)"; \ -- . version_info; \ -+ . ./version_info; \ - echo "/* automatically generated - do not edit */" > $$hdr; \ - echo "#ifndef _VERSION_H" >> $$hdr; \ - echo "#define _VERSION_H" >> $$hdr; \ diff --git a/netlabel_tools-0.19-return_codes.patch b/netlabel_tools-0.19-return_codes.patch deleted file mode 100644 index 95baa3f..0000000 --- a/netlabel_tools-0.19-return_codes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- netlabel_tools-0.19/netlabelctl/main.c 2009-01-05 16:24:16.000000000 -0500 -+++ netlabel_tools-0.19.new/netlabelctl/main.c 2010-06-17 02:54:06.864494476 -0400 -@@ -352,6 +352,7 @@ - fprintf(stderr, - MSG_ERR("unknown or missing module '%s'\n"), - module_name); -+ ret_val = 1; - goto exit; - } - ret_val = module_main(argc - optind - 1, argv + optind + 1); From 2453b4c9cdcffa6cf069ec4b525e0248f41ee1b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 09:16:01 +0000 Subject: [PATCH 14/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 7ac59ab..d23051f 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.21 -Release: 0%{?dist} +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -64,6 +64,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.21-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jul 10 2015 Paul Moore - 0.21-0 - New upstream version From 8ff572aaa4a622b5651a99d3da62f41b1da8b94b Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Fri, 9 Dec 2016 01:02:02 +0000 Subject: [PATCH 15/41] - New upstream version --- .gitignore | 1 + netlabel_tools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c37d387..773f963 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ netlabel_tools-0.19.tar.gz /netlabel_tools-0.20.tar.gz /netlabel_tools-0.21.tar.gz +/netlabel_tools-0.30.0.tar.gz diff --git a/netlabel_tools.spec b/netlabel_tools.spec index d23051f..ceaca99 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools -Version: 0.21 -Release: 1%{?dist} +Version: 0.30.0 +Release: 0%{?dist} License: GPLv2 Group: System Environment/Daemons Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -64,6 +64,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Dec 08 2016 Paul Moore - 0.30.0-0 +-New upstream version + * Thu Feb 04 2016 Fedora Release Engineering - 0.21-1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 231dfb5..3b7bc4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54ae1eb11a1b5201bea8a43a6fb08fc2 netlabel_tools-0.21.tar.gz +fc6b07bf01bc3f68f5f05071072e521e netlabel_tools-0.30.0.tar.gz From 0c3d51fce1cddf3a56442e7abfdc88e332dd094b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 22:13:27 +0000 Subject: [PATCH 16/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index ceaca99..a8b0001 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 0%{?dist} +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -64,6 +64,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.30.0-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Dec 08 2016 Paul Moore - 0.30.0-0 -New upstream version From 332037105fddf1d180a0e104f295285a5eed4d50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 22:50:55 +0000 Subject: [PATCH 17/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index a8b0001..e4ef553 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -64,6 +64,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.30.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.30.0-1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b9458de6d2801bb6cb71b1e5bdddd0d361aae7a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 03:54:39 +0000 Subject: [PATCH 18/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index e4ef553..7d1c02e 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -64,6 +64,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.30.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.30.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 6fbb7ce34eb9b39763c75f3f34d6dbdf023d3f77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 04:04:42 +0000 Subject: [PATCH 19/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 7d1c02e..42738db 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -64,6 +64,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 0.30.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.30.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From bb2cfb43db6eaf3bcd8d47b394d7b878ab6b5db2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:49 +0200 Subject: [PATCH 20/41] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- netlabel_tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 42738db..c0d3a01 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -11,6 +11,7 @@ Requires: kernel libnl3 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: gcc BuildRequires: kernel-headers BuildRequires: libnl3-devel BuildRequires: doxygen From 5d905c637fb8b7c865d437824555cce6cd029a00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 11:31:41 +0000 Subject: [PATCH 21/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index c0d3a01..e386caf 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Daemons Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -65,6 +65,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.30.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 0.30.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 2143061f8f65ae3e87eee862d5b13e813178fae3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:55 +0100 Subject: [PATCH 22/41] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- netlabel_tools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index e386caf..6501b7d 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -3,7 +3,6 @@ Name: netlabel_tools Version: 0.30.0 Release: 5%{?dist} License: GPLv2 -Group: System Environment/Daemons Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz URL: https://github.com/netlabel/netlabel_tools From f345f003b923485a0ab9f974a94e6336f5d6d2b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 12:13:52 +0000 Subject: [PATCH 23/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 6501b7d..b101077 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz URL: https://github.com/netlabel/netlabel_tools @@ -64,6 +64,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.30.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.30.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 16806cdd84e97742460f336b5ed72ee95a288d85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 18:32:15 +0000 Subject: [PATCH 24/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index b101077..2e91419 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz URL: https://github.com/netlabel/netlabel_tools @@ -64,6 +64,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.30.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.30.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3ae0590d59c6510a2afb81df37a70ccc948edcef Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Fri, 2 Aug 2019 15:18:17 +0000 Subject: [PATCH 25/41] - Applied upstream patch to improve netlabel-config error reporting (rhbz #1683434) - Removed the kernel dependency (rhbz #1733605) --- netlabel_tools.spec | 12 +++++++++--- rhbz1683434.patch | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 rhbz1683434.patch diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 2e91419..5cde966 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,12 +1,13 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 -Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz URL: https://github.com/netlabel/netlabel_tools +Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz +Patch0: rhbz1683434.patch -Requires: kernel libnl3 +Requires: libnl3 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -25,6 +26,7 @@ kernel subsystem. %prep %setup -q +%patch0 -p1 %build %configure @@ -64,6 +66,10 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Fri Aug 02 2019 Paul Moore - 0.30.0-8 +- Applied upstream patch to improve netlabel-config error reporting (rhbz #1683434) +- Removed the kernel dependency (rhbz #1733605) + * Thu Jul 25 2019 Fedora Release Engineering - 0.30.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/rhbz1683434.patch b/rhbz1683434.patch new file mode 100644 index 0000000..d8aeae1 --- /dev/null +++ b/rhbz1683434.patch @@ -0,0 +1,38 @@ +From 578a65904ff6426c01d81826873d27d0af35f355 Mon Sep 17 00:00:00 2001 +From: Paul Moore +Date: Sun, 17 Mar 2019 17:13:55 -0400 +Subject: [PATCH] netlabel_config: better error reporting on load + +Signed-off-by: Paul Moore +--- + netlabelctl/netlabel-config | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/netlabelctl/netlabel-config b/netlabelctl/netlabel-config +index 717d795..15c74f7 100755 +--- a/netlabelctl/netlabel-config ++++ b/netlabelctl/netlabel-config +@@ -114,15 +114,21 @@ function nlbl_reset() { + # load the NetLabel configuration from the configuration file + function nlbl_load() { + local ret_rc=0 ++ local line_num=0 + local line + while read line; do ++ line_num=$(($line_num + 1)) + # skip comments and blank lines + echo "$line" | egrep '^#|^$' >& /dev/null && continue + + # perform the configuration +- netlabelctl $line >& /dev/null ++ output=$(netlabelctl $line 2>&1) + rc=$? +- [[ $rc -ne 0 ]] && ret_rc=1 ++ if [[ $rc -ne 0 ]]; then ++ ret_rc=1 ++ echo "error: line $line_num \"$line\"" ++ echo "$output" ++ fi + done < "$CFG_FILE" + + return $ret_rc From e42ea25b7194d1462cffd6e829ace51d5ea40442 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 14:50:32 +0000 Subject: [PATCH 26/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 5cde966..777e304 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.30.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 02 2019 Paul Moore - 0.30.0-8 - Applied upstream patch to improve netlabel-config error reporting (rhbz #1683434) - Removed the kernel dependency (rhbz #1733605) From 4d8b8e4f7fc82ad62ee47badf462fbcabb8812c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 09:02:50 +0000 Subject: [PATCH 27/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 777e304..2159299 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.30.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 0.30.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From b5c7adca3873346a6e9bdd82979f2061d3f605fb Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 05:41:19 +0000 Subject: [PATCH 28/41] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- netlabel_tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 2159299..9c5f1fb 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -11,6 +11,7 @@ Requires: libnl3 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: make BuildRequires: gcc BuildRequires: kernel-headers BuildRequires: libnl3-devel From 7243c03bc03009f1c3c578b7373ddca7de0ed274 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:24:54 +0000 Subject: [PATCH 29/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 9c5f1fb..da07055 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -67,6 +67,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.30.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.30.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9044598ffe0052ff98eba6ab898bf8194bdd38a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:01:10 +0000 Subject: [PATCH 30/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index da07055..c937047 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -67,6 +67,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.30.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.30.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 31a208a708aa3cca8baed69ffcea3727474b7641 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:04:58 +0000 Subject: [PATCH 31/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index c937047..0f5cdd1 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -67,6 +67,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.30.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.30.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e0c2ac5e5790f0eab6f994148ac659407c86a947 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 00:26:40 +0000 Subject: [PATCH 32/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 0f5cdd1..0e1d93b 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -67,6 +67,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 0.30.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.30.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 11537431de0cea6a7c24e15c6593cb863d37b1fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:27:23 +0000 Subject: [PATCH 33/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 0e1d93b..0649359 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2 URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -67,6 +67,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.30.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 0.30.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 73ea4c2caf8ab9147181eab82dc67a7462791b33 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Tue, 30 May 2023 12:20:15 +0200 Subject: [PATCH 34/41] Migrate License tag to SPDX https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 --- netlabel_tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 0649359..e5fcb85 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -2,7 +2,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 Release: 15%{?dist} -License: GPLv2 +License: GPL-2.0-only URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz Patch0: rhbz1683434.patch From ee204d0fb2da65176c826ba4b12b7f4b4655020b Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Tue, 30 May 2023 12:21:43 +0200 Subject: [PATCH 35/41] Use %autosetup instead of deprecated %patchN Fixes: warning: %patchN is deprecated (1 usages found), use %patch N (or %patch -P N) --- netlabel_tools.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index e5fcb85..d1310c6 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -26,8 +26,7 @@ package provides the necessary user space tools to query and configure the kernel subsystem. %prep -%setup -q -%patch0 -p1 +%autosetup -p 1 %build %configure From cd145fae828d697ded5735aa684c4b96684ec69f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 16:31:56 +0000 Subject: [PATCH 36/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index d1310c6..b8c867d 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL-2.0-only URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.30.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 0.30.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 95fc1d6f98854570d36a2949bece2ce35505f4a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 09:34:29 +0000 Subject: [PATCH 37/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index b8c867d..03e8f17 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL-2.0-only URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.30.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0.30.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 245b9f42e8dd87403cd41845cf59313f43bd447f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:50:39 +0000 Subject: [PATCH 38/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 03e8f17..7cf5a27 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 17%{?dist} +Release: 18%{?dist} License: GPL-2.0-only URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.30.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.30.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 94cf7c4cca888e04fff8982a884276279aae4cb0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:22:47 +0000 Subject: [PATCH 39/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 7cf5a27..6640815 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 18%{?dist} +Release: 19%{?dist} License: GPL-2.0-only URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.30.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.30.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b52e1281d75920cabd9566a6abcd12422c15f868 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:57:48 +0000 Subject: [PATCH 40/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 6640815..1a36886 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 19%{?dist} +Release: 20%{?dist} License: GPL-2.0-only URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.30.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 0.30.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3f562447acc6b0ee106e43d2e962a70eaa625c69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:45:17 +0000 Subject: [PATCH 41/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- netlabel_tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netlabel_tools.spec b/netlabel_tools.spec index 1a36886..f29e3e9 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,7 +1,7 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 20%{?dist} +Release: 21%{?dist} License: GPL-2.0-only URL: https://github.com/netlabel/netlabel_tools Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.30.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 0.30.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild