Merge pull request #3390 from bobafetthotmail/patch-16

dvtm: move to Terminal submenu

diff --git a/libs/boost/Makefile b/libs/boost/Makefile
index 6dce9ee5a44c5a2bc84eb324be23abba965926bb..eadd98fd535b54a195f16bcdc4bd89e8f6d756a9 100644 (file)
--- a/libs/boost/Makefile
+++ b/libs/boost/Makefile
@@ -16,15 +16,15 @@ include $(INCLUDE_DIR)/nls.mk
 include $(INCLUDE_DIR)/target.mk 
 
 PKG_NAME:=boost
-PKG_VERSION:=1.61.0
-PKG_SOURCE_VERSION=1_61_0
-PKG_RELEASE:=2
+PKG_VERSION:=1.62.0
+PKG_SOURCE_VERSION:=1_62_0
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/boost/$(PKG_NAME)/$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://sourceforge.net/projects/boost/files/boost/$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_SOURCE_VERSION)
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_SOURCE_VERSION)
-PKG_MD5SUM:=874805ba2e2ee415b1877ef3297bf8ad
+PKG_MD5SUM:=36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0
 PKG_LICENSE:=Boost Software License <http://www.boost.org/users/license.html>
 PKG_MAINTAINER:=Carlos M. Ferreira <carlosmf.pt@gmail.com>
 
@@ -45,22 +45,35 @@ define Package/boost/Default
 endef
 
 define Package/boost/description
-This package provides the Boost v1.61 libraries.
+This package provides the Boost v1.62 libraries.
 Boost is a set of free, peer-reviewed, portable C++ source libraries.
+
+-----------------------------------------------------------------------------
+|                                Warning                                    |
+| In order to build all of the Boost Libraries, it is necessary             |
+| to use, at least, GCC version 5 (C++14 support) and, it is necessary to   |
+| compile the kernel with Full Language Support.                            |
+| Without these requirerements, the following libs will not be available:   |
+| - Boost.Locale                                                            |
+| - Boost.Coroutine2                                                        |
+| - Boost.Fiber                                                             |
+-----------------------------------------------------------------------------
+
 This package provides the following run-time libraries:
  - atomic
  - chrono
  - container
  - context
- - coroutine
- - - coroutine2 (requires GCC v5 and up)
+ - coroutine (Deprecated - use Coroutine2)
+ - - coroutine2 (Requires GCC v5 and up)
  - date_time
  - exception
  - filesystem
+ - fiber (Requires GCC v5 and up) - BROKEN
  - graph
  - - graph-parallel
  - iostreams
- - locale (requires kernel being compiled with full language support)
+ - locale (Requires kernel being compiled with full language support)
  - log
  - math
  - program_options
@@ -74,8 +87,9 @@ This package provides the following run-time libraries:
  - thread
  - timer
  - wave
- There are many more header-only libraries supported by Boost.
- See more at http://www.boost.org/doc/libs/1_61_0/
+
+There are many more header-only libraries supported by Boost.
+See more at http://www.boost.org/doc/libs/1_62_0/
 endef
 
 BOOST_LIBS =
@@ -109,143 +123,147 @@ define Package/boost
 endef
 
 define Package/boost/config
-    menu "Select Boost Options"
-      depends on PACKAGE_boost
-       comment "Boost compilation options."
-
-       choice
-               prompt "Compile Boost libraries."
-                       default boost-static-and-shared-libs
-                       help
-                               Choose which version to compile.
-                                -> Shared:
-                                   - Only Shared libs will be compiled.
-                                -> Static:
-                                   - Only Static libs will be compiled.
-                                -> Both:
-                                   - Both Static and Shared libs will be compiled.                 
-
-                   config boost-shared-libs
-                       bool "Shared"
+       menu "Select Boost Options"
+               depends on PACKAGE_boost
+               comment "Boost compilation options."
+
+               choice
+                       prompt "Compile Boost libraries."
+                               default boost-static-and-shared-libs
+                               help
+                                       Choose which version to compile.
+                                       -> Shared:
+                                               - Only Shared libs will be compiled.
+                                       -> Static:
+                                               - Only Static libs will be compiled.
+                                       -> Both:
+                                               - Both Static and Shared libs will be compiled.
+
+                       config boost-shared-libs
+                               bool "Shared"
                        
                        config boost-static-libs
-                       bool "Static"                   
+                               bool "Static"
                        
                        config boost-static-and-shared-libs
-                       bool "Both"                     
-           endchoice
-
-       choice
-               prompt "Selects Boost Runtime linkage."
-               default boost-runtime-shared
-               help
-                       Choose which C and C++ runtimes to use:
-                        -> Use Shared runtimes.
-                        -> Use Static runtimes.
-                           - Not available if Shared libs are to be built.
-                        -> Use both runtimes.
-                           - Not available if Shared libs are to be built.
-                           - Two separate versions of Boost are built, linking each to a different runtime. 
-                           - This option requires "Use tagged names" option to be active.
-
-                   config boost-runtime-shared
-                       bool "Shared"
-
-                   config boost-runtime-static
-                       depends on @(!boost-shared-libs&&!boost-static-and-shared-libs)
-                       bool "Static"                   
-                   
-                   config boost-runtime-static-and-shared
-                       depends on @(boost-use-name-tags&&!boost-shared-libs&&!boost-static-and-shared-libs)
-                       bool "Both"
-           endchoice
-
-       choice
-               prompt "Select a Variant."
-               default boost-variant-release
-               help
-                       Chooses which boost variant should be selected:
-                       -> Release: Optimizes Boost for release.
-                          - Optimization: Speed;  Debug Symbols: Off; Inlining: Full; Runtime Debugging: Off.
-                       -> Debug: 
-                          - Optimization: Off; Debug Symbols: On; Inlining: Off; Runtime Debugging: On.
-                       -> Profile:
-                          - Profiling: On;  Debug Symbols: On.
-
-               config boost-variant-release
-                       bool "Release"
-
-               config boost-variant-debug
-                       bool "Debug"
-                               
-               config boost-variant-profile
-                       bool "Profile"
-       endchoice               
-
-           config boost-use-name-tags
-               bool "Use tagged names."
-               help 
-                       Add name tags the lib files, to diferentiate each library version:
-                         "-mt" for multi-threading.
-                         "-d" for debugging.
-                         "-s" for runtime static link".
-                       Might break compatibility with libraries that expect boost libs with default names.
-               default n               
-
-           config boost-single-thread
-               depends on @boost-use-name-tags
-               bool "Single thread Support."
-               help 
-                       Compile Boost libraries in single-thread mode.
-               default n
+                               bool "Both"
+               endchoice
+
+               choice
+                       prompt "Selects Boost Runtime linkage."
+                       default boost-runtime-shared
+                       help
+                               Choose which C and C++ runtimes to use:
+                               -> Use Shared runtimes.
+                               -> Use Static runtimes.
+                                       - Not available if Shared libs are to be built.
+                               -> Use both runtimes.
+                                       - Not available if Shared libs are to be built.
+                                       - Two separate versions of Boost are built, linking each to a different runtime. 
+                                       - This option requires "Use tagged names" option to be active.
+
+                       config boost-runtime-shared
+                               bool "Shared"
+
+                       config boost-runtime-static
+                               depends on @(!boost-shared-libs&&!boost-static-and-shared-libs)
+                               bool "Static"                   
+
+                       config boost-runtime-static-and-shared
+                               depends on @(boost-use-name-tags&&!boost-shared-libs&&!boost-static-and-shared-libs)
+                               bool "Both"
+               endchoice
+
+               choice
+                       prompt "Select a Variant."
+                       default boost-variant-release
+                       help
+                               Chooses which boost variant should be selected:
+                               -> Release: Optimizes Boost for release.
+                                       - Optimization: Speed;  Debug Symbols: Off; Inlining: Full; Runtime Debugging: Off.
+                               -> Debug: 
+                                       - Optimization: Off; Debug Symbols: On; Inlining: Off; Runtime Debugging: On.
+                               -> Profile:
+                                       - Profiling: On;  Debug Symbols: On.
+
+                       config boost-variant-release
+                               bool "Release"
+
+                       config boost-variant-debug
+                               bool "Debug"
+
+                       config boost-variant-profile
+                               bool "Profile"
+               endchoice
+
+               config boost-use-name-tags
+                       bool "Use tagged names."
+                       help 
+                               Add name tags the lib files, to diferentiate each library version:
+                                 "-mt" for multi-threading.
+                                 "-d" for debugging.
+                                 "-s" for runtime static link".
+                               Might break compatibility with libraries that expect boost libs with default names.
+                       default n
+
+               config boost-single-thread
+                       depends on @boost-use-name-tags
+                       bool "Single thread Support."
+                       help 
+                               Compile Boost libraries in single-thread mode.
+                       default n
                            
-           config boost-build-type-complete
-               depends on @boost-use-name-tags
-               bool "Complete Boost Build."
-               help 
-                       Builds both release and debug libs. It will take much longer to compile.
-               default n               
-    endmenu
-
-    menu "Select Boost libraries"
-      depends on PACKAGE_boost
+               config boost-build-type-complete
+                       depends on @boost-use-name-tags
+                       bool "Complete Boost Build."
+                       help 
+                               Builds both release and debug libs. It will take much longer to compile.
+                       default n
+       endmenu
+
+       menu "Select Boost libraries"
+               depends on PACKAGE_boost
                comment "Libraries"
 
                config boost-libs-all
-               bool "Include all Boost libraries."
-               select PACKAGE_boost-libs               
+                       bool "Include all Boost libraries."
+                       select PACKAGE_boost-libs
+                       select boost-test-pkg
+                       select boost-coroutine2
+                       select boost-graph-parallel
 
                config boost-test-pkg
-               bool "Boost test package."
-               select PACKAGE_boost-test
-           
+                       bool "Boost test package."
+                       select PACKAGE_boost-test
+
                config boost-coroutine2
-               depends on @(GCC_VERSION_5 || GCC_VERSION_6)
-               bool "Boost couroutine2 support."
-               select PACKAGE_boost-coroutine
-               default n
+                       depends on !@GCC_VERSION_4_8
+                       bool "Boost couroutine2 support."
+                       select PACKAGE_boost-coroutine
+                       default n
 
                config boost-graph-parallel
-               bool "Boost parallel graph support."
-               select PACKAGE_boost-graph
-               default n
+                       bool "Boost parallel graph support."
+                       select PACKAGE_boost-graph
+                       default n
 
                $(foreach lib,$(BOOST_LIBS), \
-                 config PACKAGE_boost-$(lib)
-                 prompt "Boost $(lib) library."
-                 $(if $(findstring locale,$(lib)),depends on @BUILD_NLS,)
+                       config PACKAGE_boost-$(lib)
+                       prompt "Boost $(lib) library."
+                       $(if $(findstring locale,$(lib)),depends on @BUILD_NLS,)
+                       $(if $(findstring fiber,$(lib)),depends on BROKEN,)
                )
-       endmenu
+       endmenu
 
 endef
 
 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_boost-test
 
 define Package/boost-test
-  $(call Package/boost/Default)
-  TITLE+= (test)
-  HIDDEN:=1  
-  DEPENDS+=+boost-system +boost-timer
+       $(call Package/boost/Default)
+       TITLE+= (test)
+       HIDDEN:=1
+       DEPENDS+=+boost-system +boost-timer
 endef
 
 define Build/Configure
@@ -281,6 +299,7 @@ $(eval $(call DefineBoostLibrary,context,chrono system thread,))
 $(eval $(call DefineBoostLibrary,coroutine,system chrono context thread,))
 $(eval $(call DefineBoostLibrary,date_time,,))
 #$(eval $(call DefineBoostLibrary,exception,,))
+$(eval $(call DefineBoostLibrary,fiber,coroutine,))
 $(eval $(call DefineBoostLibrary,filesystem,system,))
 $(eval $(call DefineBoostLibrary,graph,regex,))
 $(eval $(call DefineBoostLibrary,iostreams,,+PACKAGE_boost-iostreams:zlib))
@@ -365,8 +384,8 @@ define Build/Compile
                        $(if $(CONFIG_PACKAGE_boost-test),,--without-test) \
                        $(foreach lib,$(BOOST_LIBS), \
                                $(if $(findstring python,$(lib)), \
-                                 $(if $(or $(CONFIG_PACKAGE_boost-python),$(CONFIG_PACKAGE_boost-python3)),,--without-python), \
-                                 $(if $(CONFIG_PACKAGE_boost-$(lib)),,--without-$(lib))) \
+                                       $(if $(or $(CONFIG_PACKAGE_boost-python),$(CONFIG_PACKAGE_boost-python3)),,--without-python), \
+                                       $(if $(CONFIG_PACKAGE_boost-$(lib)),,--without-$(lib))) \
                        ) \
                        $(if $(CONFIG_PACKAGE_boost-locale),boost.locale.iconv=on -sICONV_PATH=$(ICONV_PREFIX) boost.locale.posix=$(if $(USE_MUSL),on,off), \
                                boost.locale.iconv=off) \
@@ -408,7 +427,7 @@ define Package/boost/Default/install
                $(PKG_INSTALL_DIR)/lib/ -name 'libboost_$(2)*.so*' -exec $(CP) {} $(1)/usr/lib/ \;
 endef
 
-define Package/boost-test/install      
+define Package/boost-test/install
                $(INSTALL_DIR) \
                        $(1)/usr/lib
 
@@ -421,7 +440,7 @@ endef
 
 define BuildBoostLibrary
   define Package/boost-$(1)/install
-       $(call Package/boost/Default/install,$$(1),$(1))
+    $(call Package/boost/Default/install,$$(1),$(1))
   endef
 
   $$(eval $$(call BuildPackage,boost-$(1)))

diff --git a/libs/loudmouth/Makefile b/libs/loudmouth/Makefile
new file mode 100644 (file)
index 0000000..1f06209
--- /dev/null
+++ b/libs/loudmouth/Makefile
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2007-2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=loudmouth
+PKG_VERSION:=1.5.3
+PKG_RELEASE:=1
+
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+
+PKG_LICENSE:=LGPLv2.1
+PKG_LICENSE_FILES:=COPYING
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/mcabber/loudmouth.git
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_MD5SUM:=7616cf124a8d72d007e7475b5aeb20ad
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/loudmouth
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+glib2 +libopenssl
+  TITLE:=loudmouth
+  URL:=https://github.com/mcabber/loudmouth
+endef
+
+define Package/loudmouth/description
+  Lightweight and easy-to-use C library for programming with the Jabber protocol
+endef
+
+CONFIGURE_ARGS += \
+       --with-ssl=openssl
+
+define Build/Configure
+       ( cd $(PKG_BUILD_DIR); ./autogen.sh )
+       $(call Build/Configure/Default)
+endef
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/include/loudmouth-1.0/ \
+               $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
+               $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/loudmouth/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,loudmouth))

diff --git a/utils/ap51-flash/Makefile b/utils/ap51-flash/Makefile
new file mode 100644 (file)
index 0000000..a30fa5d
--- /dev/null
+++ b/utils/ap51-flash/Makefile
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2010-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ap51-flash
+PKG_VERSION:=2016-10-16
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://dev.cloudtrax.com/ap51-flash.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=48b3fbac1c30c5968b2608eb09b53ea37c310a24
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_MAINTAINER:=Russell Senior <russell@personaltelco.net>
+
+include $(INCLUDE_DIR)/package.mk
+
+ifeq ($(CONFIG_BIG_ENDIAN),y)
+  STAMP_BUILT:=$(STAMP_BUILT)_big
+endif
+
+define Package/ap51-flash
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=A tool for flashing (nearly) all ap51/ap61 based routers
+  URL:=http://dev.cloudtrax.com/wiki/ap51-flash-station
+endef
+
+TARGET_EXTRA_CFLAGS:=-DFLASH_FROM_FILE -DNO_LIBPCAP -D_GNU_SOURCE -DIPPORT_TFTP=69
+ifeq ($(CONFIG_BIG_ENDIAN),y)
+       TARGET_EXTRA_CFLAGS:=$(TARGET_EXTRA_CFLAGS) -DUIP_CONF_BYTE_ORDER=1234
+endif
+
+# pass optimization flags
+MAKE_FLAGS += \
+       OFLAGS="$(TARGET_CFLAGS)" \
+       EXTRA_CFLAGS="$(TARGET_EXTRA_CFLAGS)" \
+       REVISION="$(PKG_VERSION)" \
+       ap51-flash
+
+define Package/ap51-flash/install
+       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/usr/sbin \
+               $(1)/usr/lib/ap51-flash
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/ap51-flash $(1)/usr/sbin/
+       $(INSTALL_BIN) ./files/ap51-flash.init $(1)/etc/init.d/ap51-flash
+       $(INSTALL_BIN) ./files/ap51-flash.sh $(1)/usr/lib/ap51-flash/ap51-flash.sh
+       $(INSTALL_DATA) ./files/ap51-flash.config $(1)/etc/config/ap51-flash
+endef
+
+define Package/ap51-flash/conffiles
+/etc/config/ap51-flash
+endef
+
+$(eval $(call BuildPackage,ap51-flash))

diff --git a/utils/ap51-flash/files/ap51-flash.config b/utils/ap51-flash/files/ap51-flash.config
new file mode 100644 (file)
index 0000000..f66973f
--- /dev/null
+++ b/utils/ap51-flash/files/ap51-flash.config
@@ -0,0 +1,6 @@
+#config flash
+#      option ifname   eth0.1
+#      option rootfs   /tmp/images/openwrt-atheros-root.squashfs
+#      option kernel   /tmp/images/openwrt-atheros-vmlinux.lzma
+#      option ubnt     /tmp/images/openwrt-atheros-ubnt5-squashfs.bin
+##     option loop     '1'

diff --git a/utils/ap51-flash/files/ap51-flash.init b/utils/ap51-flash/files/ap51-flash.init
new file mode 100644 (file)
index 0000000..1633ac4
--- /dev/null
+++ b/utils/ap51-flash/files/ap51-flash.init
@@ -0,0 +1,50 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2010 OpenWrt.org
+
+START=20
+
+NAME=ap51-flash
+
+start_daemon() {
+       local cfg="$1"
+
+       config_get_bool loop "$cfg" loop
+       config_get ifname "$cfg" ifname
+       config_get rootfs "$cfg" rootfs
+       config_get kernel "$cfg" kernel
+       config_get ubnt "$cfg" ubnt
+       [ "$loop" != "1" ] && loop=0
+       if [ -n "$ifname" -a -n "$rootfs" -a -n "$kernel" ] || \
+          [ -n "$ifname" -a -n "$ubnt" ]; then
+               PID="`cat /var/run/$NAME.sh-$ifname.pid 2> /dev/null`"
+               [ -z "`ps | grep "^.[ ]*$PID "`" ] && \
+                       rm /var/run/$NAME.sh-$ifname.pid
+               [ -n "`ls /var/run/$NAME.sh-$ifname.pid 2> /dev/null`" ] && {
+                       echo "Can't start more than one ap51-flash for interface $ifname!"
+                       return 0
+               }
+               start-stop-daemon -S -b -m -p /var/run/$NAME.sh-$ifname.pid -n $NAME.sh \
+                       -x /usr/lib/ap51-flash/$NAME.sh -- "$loop" "$ifname" "$rootfs" "$kernel" "$ubnt"
+       fi
+}
+
+start() {
+       config_load ap51-flash
+       config_foreach start_daemon flash
+}
+
+stop() {
+       # Terminating all ap51-flash processes
+       echo "WARNING: Going to teminate all ap51-flash processes! (hope you made sure that they're not flashing right now)"
+       echo "OR you can stop this with Ctrl+c within 10 seconds"
+       sleep 10
+       local pidfile
+       for pidfile in `ls /var/run/${NAME}.sh-*.pid 2> /dev/null`; do
+               start-stop-daemon -K -s TERM -p "${pidfile}" -n "${NAME}.sh" >/dev/null
+               rm -f "${pidfile}"
+       done
+       for pidfile in `ls /var/run/${NAME}-*.pid 2> /dev/null`; do
+               start-stop-daemon -K -s TERM -p "${pidfile}" -n "${NAME}" >/dev/null
+               rm -f "${pidfile}"
+       done
+}

diff --git a/utils/ap51-flash/files/ap51-flash.sh b/utils/ap51-flash/files/ap51-flash.sh
new file mode 100755 (executable)
index 0000000..9ac33ee
--- /dev/null
+++ b/utils/ap51-flash/files/ap51-flash.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+NAME=ap51-flash
+rootfs=""
+kernel=""
+ubnt=""
+
+[ $1 -eq "1" ] && loop="1"
+ifname="$2"
+[ -n "$3" ] && rootfs="--rootfs $3"
+[ -n "$4" ] && kernel="--kernel $4"
+[ -n "$5" ] && ubnt="--ubnt $5"
+
+while [ 1 ]; do
+       start-stop-daemon -S -m -p /var/run/$NAME-$ifname.pid -n $NAME \
+               -x /usr/sbin/$NAME -- --flash-from-file $rootfs $kernel $ubnt $ifname
+       
+       rm /var/run/$NAME-$ifname.pid
+       [ "$loop" != "1" ] && break
+       sleep 15
+done

diff --git a/utils/ccrypt/Makefile b/utils/ccrypt/Makefile
index 0e8973b8537855ae5f93e9d95eff3476ac85a49c..1e25305a7e92b3a1e2a07c7e38374cddbcf3fab9 100644 (file)
--- a/utils/ccrypt/Makefile
+++ b/utils/ccrypt/Makefile
@@ -24,6 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ccrypt
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=Encryption
   TITLE:=ccrypt is a utility for encrypting and decrypting files and streams
   URL:=http://ccrypt.sourceforge.net/
 endef

diff --git a/utils/tcsh/Makefile b/utils/tcsh/Makefile
index 317b28d210934d0a61aaf41f89d78d7f45d11d92..5d7e4a1d68a70507b18644f33813469214a9bd6e 100644 (file)
--- a/utils/tcsh/Makefile
+++ b/utils/tcsh/Makefile
@@ -26,6 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/tcsh
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=Shells
   TITLE:=Enhanced Berkeley UNIX C shell
   DEPENDS:=+libncurses
   URL:=http://www.tcsh.org/

diff --git a/utils/tmux/Makefile b/utils/tmux/Makefile
index 16dabf59ab800e2e6d03f20cb009e17dadbfcb79..a66db4bf5b8bb8947bb08122ada5600918fce349 100644 (file)
--- a/utils/tmux/Makefile
+++ b/utils/tmux/Makefile
@@ -27,6 +27,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/tmux
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=Terminal
   TITLE:=Terminal multiplexer
   DEPENDS:=+libncurses +libevent2 +libpthread +librt
   URL:=http://tmux.sourceforge.net/