3 files changed, 51 insertions, 6 deletions
diff --git a/slackware64/n/maketag b/slackware64/n/maketag
index 3457fe92e..cbcf40221 100644
--- a/slackware64/n/maketag
+++ b/slackware64/n/maketag
@@ -25,6 +25,7 @@ Press ENTER when you are done." \
 "bsd-finger" "BSD finger daemon and client" "on" \
 "ca-certificates" "PEM certificates to verify SSL connections" "on" \
 "cifs-utils" "CIFS filesystem utilities" "on" \
+"conntrack-tools" "Connection Tracking System tools" "on" \
 "crda" "Central Regulatory Domain Agent" "on" \
 "curl" "Command-line URL transfer utility" "on" \
 "cyrus-sasl" "SASL email authentication library" "on" \
@@ -32,6 +33,7 @@ Press ENTER when you are done." \
 "dhcpcd" "DHCP client daemon" "on" \
 "dirmngr" "Certificate Revocation Lists Manager for GPG" "on" \
 "dnsmasq" "Small DNS/DHCP server for a LAN" "on" \
+"ebtables" "Bridge filtering utility" "on" \
 "elm" "Menu-driven user mail program" "on" \
 "epic5" "EPIC Internet Relay Chat (IRC) client" "on" \
 "ethtool" "A tool for configuring Ethernet devices" "on" \
@@ -50,6 +52,7 @@ Press ENTER when you are done." \
 "imapd" "ipop3d/imapd remote mail access daemons" "on" \
 "inetd" "Internet super server daemon" "on" \
 "iproute2" "Kernel routing and traffic control" "on" \
+"ipset" "Kernel IP sets admin tool" "on" \
 "iptables" "Firewall configuration utility" "on" \
 "iptraf-ng" "Network monitoring program" "on" \
 "iputils" "Some common network tools" "on" \
@@ -62,6 +65,16 @@ Press ENTER when you are done." \
 "libgcrypt" "General purpose crypto library" "on" \
 "libgpg-error" "GnuPG Error Definitions Library" "on" \
 "libksba" "X.509 & CMS library for S/MIME and TLS" "on" \
+"libmbim" "Mobile Broadband Interface Model library" "on" \
+"libmnl" "Netlink user-space library" "on" \
+"libnetfilter_acct" "Netfilter accounting library" "on" \
+"libnetfilter_conntrack" "Netfilter conntrack library" "on" \
+"libnetfilter_cthelper" "Netfilter conntrack helpers library" "on" \
+"libnetfilter_cttimeout" "Netfilter connection tracking timeout library" "on" \
+"libnetfilter_log" "Netfilter packet logging library" "on" \
+"libnetfilter_queue" "Netfilter packet queueing library" "on" \
+"libnfnetlink" "Netfilter kernel/userspace comm library" "on" \
+"libqmi" "QMI library and utils" "on" \
 "links" "Text-based WWW browser (with frames)" "on" \
 "lynx" "Classic text-based WWW browser" "on" \
 "mailx" "A simple user mail program" "on" \
@@ -91,6 +104,7 @@ Press ENTER when you are done." \
 "network-scripts" "Scripts required for networking on Slackware" "on" \
 "netwrite" "Write to users on a remote machine" "on" \
 "newspost" "Posts multipart binaries on USENET" "on" \
+"nfacct" "Tool to manage accounting objects" "on" \
 "nfs-utils" "Network File System daemons" "on" \
 "nmap" "Network scanning utility" "on" \
 "nn" "The NN news reader" "on" \
@@ -131,6 +145,7 @@ Press ENTER when you are done." \
 "tin" "The 'tin' news reader" "on" \
 "traceroute" "Packet tracing utility" "on" \
 "trn" "A threaded news reader" "on" \
+"ulogd" "Logging daemon for netfilter/iptables" "on" \
 "uucp" "Taylor UUCP with HDB && Taylor configs" "on" \
 "vlan" "Virtual LAN configuration tool" "on" \
 "vsftpd" "The Very Secure FTP (file transfer) daemon" "on" \
@@ -146,7 +161,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba libmbim libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libqmi links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn ulogd uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -154,9 +169,9 @@ ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba libmbim libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libqmi links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn ulogd uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/n/maketag.ez b/slackware64/n/maketag.ez
index 3457fe92e..cbcf40221 100644
--- a/slackware64/n/maketag.ez
+++ b/slackware64/n/maketag.ez
@@ -25,6 +25,7 @@ Press ENTER when you are done." \
 "bsd-finger" "BSD finger daemon and client" "on" \
 "ca-certificates" "PEM certificates to verify SSL connections" "on" \
 "cifs-utils" "CIFS filesystem utilities" "on" \
+"conntrack-tools" "Connection Tracking System tools" "on" \
 "crda" "Central Regulatory Domain Agent" "on" \
 "curl" "Command-line URL transfer utility" "on" \
 "cyrus-sasl" "SASL email authentication library" "on" \
@@ -32,6 +33,7 @@ Press ENTER when you are done." \
 "dhcpcd" "DHCP client daemon" "on" \
 "dirmngr" "Certificate Revocation Lists Manager for GPG" "on" \
 "dnsmasq" "Small DNS/DHCP server for a LAN" "on" \
+"ebtables" "Bridge filtering utility" "on" \
 "elm" "Menu-driven user mail program" "on" \
 "epic5" "EPIC Internet Relay Chat (IRC) client" "on" \
 "ethtool" "A tool for configuring Ethernet devices" "on" \
@@ -50,6 +52,7 @@ Press ENTER when you are done." \
 "imapd" "ipop3d/imapd remote mail access daemons" "on" \
 "inetd" "Internet super server daemon" "on" \
 "iproute2" "Kernel routing and traffic control" "on" \
+"ipset" "Kernel IP sets admin tool" "on" \
 "iptables" "Firewall configuration utility" "on" \
 "iptraf-ng" "Network monitoring program" "on" \
 "iputils" "Some common network tools" "on" \
@@ -62,6 +65,16 @@ Press ENTER when you are done." \
 "libgcrypt" "General purpose crypto library" "on" \
 "libgpg-error" "GnuPG Error Definitions Library" "on" \
 "libksba" "X.509 & CMS library for S/MIME and TLS" "on" \
+"libmbim" "Mobile Broadband Interface Model library" "on" \
+"libmnl" "Netlink user-space library" "on" \
+"libnetfilter_acct" "Netfilter accounting library" "on" \
+"libnetfilter_conntrack" "Netfilter conntrack library" "on" \
+"libnetfilter_cthelper" "Netfilter conntrack helpers library" "on" \
+"libnetfilter_cttimeout" "Netfilter connection tracking timeout library" "on" \
+"libnetfilter_log" "Netfilter packet logging library" "on" \
+"libnetfilter_queue" "Netfilter packet queueing library" "on" \
+"libnfnetlink" "Netfilter kernel/userspace comm library" "on" \
+"libqmi" "QMI library and utils" "on" \
 "links" "Text-based WWW browser (with frames)" "on" \
 "lynx" "Classic text-based WWW browser" "on" \
 "mailx" "A simple user mail program" "on" \
@@ -91,6 +104,7 @@ Press ENTER when you are done." \
 "network-scripts" "Scripts required for networking on Slackware" "on" \
 "netwrite" "Write to users on a remote machine" "on" \
 "newspost" "Posts multipart binaries on USENET" "on" \
+"nfacct" "Tool to manage accounting objects" "on" \
 "nfs-utils" "Network File System daemons" "on" \
 "nmap" "Network scanning utility" "on" \
 "nn" "The NN news reader" "on" \
@@ -131,6 +145,7 @@ Press ENTER when you are done." \
 "tin" "The 'tin' news reader" "on" \
 "traceroute" "Packet tracing utility" "on" \
 "trn" "A threaded news reader" "on" \
+"ulogd" "Logging daemon for netfilter/iptables" "on" \
 "uucp" "Taylor UUCP with HDB && Taylor configs" "on" \
 "vlan" "Virtual LAN configuration tool" "on" \
 "vsftpd" "The Very Secure FTP (file transfer) daemon" "on" \
@@ -146,7 +161,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba libmbim libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libqmi links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn ulogd uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -154,9 +169,9 @@ ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
+ModemManager NetworkManager alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates cifs-utils conntrack-tools crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq ebtables elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit iftop imapd inetd iproute2 ipset iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw lftp libassuan libgcrypt libgpg-error libksba libmbim libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout libnetfilter_log libnetfilter_queue libnfnetlink libqmi links lynx mailx mcabber metamail mobile-broadband-provider-info mtr mutt nc ncftp net-snmp net-tools netatalk netdate netkit-bootparamd netkit-ftp netkit-ntalk netkit-routed netkit-rsh netkit-rusers netkit-rwall netkit-rwho netkit-timed netpipes nettle netwatch network-scripts netwrite newspost nfacct nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn p11-kit php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync samba sendmail sendmail-cf slrn snownews stunnel tcp_wrappers tcpdump telnet tftp-hpa tin traceroute trn ulogd uucp vlan vsftpd wget whois wireless-tools wpa_supplicant yptools ytalk zd1211-firmware \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/n/tagfile b/slackware64/n/tagfile
index 945ecbe61..c97d97e9a 100644
--- a/slackware64/n/tagfile
+++ b/slackware64/n/tagfile
@@ -12,6 +12,7 @@ bridge-utils:OPT
 bsd-finger:OPT
 ca-certificates:REC
 cifs-utils:OPT
+conntrack-tools:REC
 crda:REC
 curl:OPT
 cyrus-sasl:REC
@@ -19,6 +20,7 @@ dhcp:OPT
 dhcpcd:REC
 dirmngr:REC
 dnsmasq:OPT
+ebtables:REC
 elm:OPT
 epic5:OPT
 ethtool:OPT
@@ -37,6 +39,7 @@ iftop:REC
 imapd:OPT
 inetd:REC
 iproute2:OPT
+ipset:REC
 iptables:ADD
 iptraf-ng:OPT
 iputils:ADD
@@ -49,6 +52,16 @@ libassuan:REC
 libgcrypt:REC
 libgpg-error:REC
 libksba:REC
+libmbim:REC
+libmnl:REC
+libnetfilter_acct:REC
+libnetfilter_conntrack:REC
+libnetfilter_cthelper:REC
+libnetfilter_cttimeout:REC
+libnetfilter_log:REC
+libnetfilter_queue:REC
+libnfnetlink:REC
+libqmi:REC
 links:OPT
 lynx:OPT
 mailx:REC
@@ -78,6 +91,7 @@ netwatch:OPT
 network-scripts:ADD
 netwrite:OPT
 newspost:OPT
+nfacct:REC
 nfs-utils:OPT
 nmap:OPT
 nn:OPT
@@ -118,6 +132,7 @@ tftp-hpa:OPT
 tin:OPT
 traceroute:OPT
 trn:OPT
+ulogd:REC
 uucp:OPT
 vlan:OPT
 vsftpd:REC