1 files changed, 9 insertions, 14 deletions
diff --git a/slackware64/n/maketag b/slackware64/n/maketag
index 617897051..3457fe92e 100644
--- a/slackware64/n/maketag
+++ b/slackware64/n/maketag
@@ -11,6 +11,8 @@ from series N.  Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install.  \
 Press ENTER when you are done." \
 21 72 11 \
+"ModemManager" "mobile broadband modem D-bus API" "on" \
+"NetworkManager" "Networking configuration daemon" "on" \
 "alpine" "Alpine menu-driven mail program" "on" \
 "autofs" "Linux automounter" "on" \
 "biff+comsat" "Announces email delivery" "on" \
@@ -22,6 +24,7 @@ Press ENTER when you are done." \
 "bridge-utils" "Tools for setting up Ethernet bridges" "on" \
 "bsd-finger" "BSD finger daemon and client" "on" \
 "ca-certificates" "PEM certificates to verify SSL connections" "on" \
+"cifs-utils" "CIFS filesystem utilities" "on" \
 "crda" "Central Regulatory Domain Agent" "on" \
 "curl" "Command-line URL transfer utility" "on" \
 "cyrus-sasl" "SASL email authentication library" "on" \
@@ -43,6 +46,7 @@ Press ENTER when you are done." \
 "httpd" "Apache WWW (HTTP) server" "on" \
 "icmpinfo" "Dump or log ICMP packets" "on" \
 "idnkit" "internationalized domain names toolkit" "on" \
+"iftop" "Display bandwidth usage on an interface" "on" \
 "imapd" "ipop3d/imapd remote mail access daemons" "on" \
 "inetd" "Internet super server daemon" "on" \
 "iproute2" "Kernel routing and traffic control" "on" \
@@ -53,14 +57,6 @@ Press ENTER when you are done." \
 "ipw2200-fw" "Firmware for Intel ipw2200 wireless." "on" \
 "irssi" "IRSSI Internet Relay Chat (IRC) client" "on" \
 "iw" "Utility for mac80211 based wireless devices" "on" \
-"iwlwifi-100-ucode" "Microcode for Intel Centrino N 100 wireless" "on" \
-"iwlwifi-1000-ucode" "Microcode for Intel 1000 wireless chips" "on" \
-"iwlwifi-3945-ucode" "Microcode for Intel 3945 wireless chips" "on" \
-"iwlwifi-4965-ucode" "Microcode for Intel 4965 wireless chips" "on" \
-"iwlwifi-5000-ucode" "Microcode for Intel 5000 wireless chips" "on" \
-"iwlwifi-5150-ucode" "Microcode for Intel 5150 wireless chips" "on" \
-"iwlwifi-6000-ucode" "Microcode for Intel 6000 wireless chips" "on" \
-"iwlwifi-6xxx-ucode" "Microcode for Intel 6XXX wireless chips" "on" \
 "lftp" "Shell-like FTP and HTTP transfer program" "on" \
 "libassuan" "Interprocess Communication Library for GPG" "on" \
 "libgcrypt" "General purpose crypto library" "on" \
@@ -71,6 +67,7 @@ Press ENTER when you are done." \
 "mailx" "A simple user mail program" "on" \
 "mcabber" "Jabber messaging client for the console" "on" \
 "metamail" "Metamail multimedia mail extensions" "on" \
+"mobile-broadband-provider-info" "mobile broadband provider settings" "on" \
 "mtr" "Network diagnosic tool" "on" \
 "mutt" "The Mutt E-Mail Client" "on" \
 "nc" "Netcat network utility" "on" \
@@ -89,6 +86,7 @@ Press ENTER when you are done." \
 "netkit-rwho" "See information about users on the local net" "on" \
 "netkit-timed" "BSD time server daemon" "on" \
 "netpipes" "Network pipe utilities" "on" \
+"nettle" "Cryptographic library" "on" \
 "netwatch" "Another network monitoring program" "on" \
 "network-scripts" "Scripts required for networking on Slackware" "on" \
 "netwrite" "Write to users on a remote machine" "on" \
@@ -105,6 +103,7 @@ Press ENTER when you are done." \
 "openssh" "OpenSSH Secure Shell" "on" \
 "openssl" "OpenSSL Secure Sockets Layer toolkit" "on" \
 "openvpn" "Secure IP VPN tunnel daemon" "on" \
+"p11-kit" "PKCS 11 public key toolkit" "on" \
 "php" "PHP scripting language for Apache" "on" \
 "pidentd" "TCP/IP IDENT protocol server" "on" \
 "pinentry" "PIN Entry dialogs" "on" \
@@ -119,10 +118,6 @@ Press ENTER when you are done." \
 "rfkill" "tool to query wireless interfaces" "on" \
 "rp-pppoe" "Connect to ADSL ISPs that use PPPoE" "on" \
 "rsync" "Enhanced replacement for rcp" "on" \
-"rt2860-firmware" "Firmware for rt2860 PCI wireless cards." "on" \
-"rt2870-firmware" "Firmware for rt2870 USB wireless cards." "on" \
-"rt61-firmware" "Firmware for rt61 wireless cards." "on" \
-"rt71w-firmware" "Firmware for rt71w wireless cards." "on" \
 "samba" "SMB print/file server for Windows LANs" "on" \
 "sendmail" "The sendmail mail transport agent" "on" \
 "sendmail-cf" "Extra configuration files for sendmail" "on" \
@@ -151,7 +146,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw iwlwifi-100-ucode iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode iwlwifi-6xxx-ucode lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail 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 netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync rt2860-firmware rt2870-firmware rt61-firmware rt71w-firmware 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 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 \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -159,7 +154,7 @@ alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-u
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-alpine autofs biff+comsat bind bluez bluez-firmware bluez-hcidump bootp bridge-utils bsd-finger ca-certificates crda curl cyrus-sasl dhcp dhcpcd dirmngr dnsmasq elm epic5 ethtool fetchmail getmail gnupg gnupg2 gnutls gpa gpgme htdig httpd icmpinfo idnkit imapd inetd iproute2 iptables iptraf-ng iputils ipw2100-fw ipw2200-fw irssi iw iwlwifi-100-ucode iwlwifi-1000-ucode iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode iwlwifi-6000-ucode iwlwifi-6xxx-ucode lftp libassuan libgcrypt libgpg-error libksba links lynx mailx mcabber metamail 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 netwatch network-scripts netwrite newspost nfs-utils nmap nn ntp obex-data-server obexfs obexftp openldap-client openobex openssh openssl openvpn php pidentd pinentry popa3d portmap ppp procmail proftpd pssh pth rdist rfkill rp-pppoe rsync rt2860-firmware rt2870-firmware rt61-firmware rt71w-firmware 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 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 \
  ; do
  if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag