Add mysql and postgresql packages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@499 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/Config.in

@@ -48,6 +48,8 @@ source "package/openssl/Config.in"
 source "package/pcre/Config.in"
 source "package/popt/Config.in"
 source "package/libnet/Config.in"
+source "package/mysql/Config.in"
+source "package/postgresql/Config.in"
 
 endmenu
 

package/Makefile

@@ -40,6 +40,8 @@ package-$(BR2_PACKAGE_WOL) += wol
 package-$(BR2_PACKAGE_ZLIB) += zlib
 package-$(BR2_PACKAGE_DHCPFWD) += dhcp-forwarder
 package-$(BR2_PACKAGE_LIBNET) += libnet
+package-$(BR2_PACKAGE_LIBMYSQLCLIENT) += mysql
+package-$(BR2_PACKAGE_LIBPQ) += postgresql
 
 all: compile install
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) linux-clean
@@ -54,6 +56,8 @@ nfs-server-compile: portmap-compile
 portmap-compile: tcp_wrappers-compile
 lcd4linux-compile: ncurses-compile
 libnet-compile: libpcap-compile
+mysql-compile: ncurses-compile zlib-compile
+postgresql-compile: zlib-compile
 
 $(patsubst %,%-prepare,$(package-y) $(package-m)): linux-install
 

package/mysql/Config.in

@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBMYSQLCLIENT
+	tristate "libmysqlclient (MySQL client library)"
+	default m
+	help
+	  MySQL client library.
+	  
+	  http://dev.mysql.com/
+	  
+

package/mysql/Makefile

@@ -0,0 +1,58 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME := mysql
+PKG_VERSION := 4.0.24
+PKG_RELEASE := 2
+PKG_MD5SUM := 408d3001ed715ddc90009c247e548638
+
+PKG_SOURCE_SITE := \
+	http://mysql.he.net/Downloads/MySQL-4.0/ \
+	http://www.linorg.usp.br/mysql/Downloads/MySQL-4.0/ \
+	http://mysql.planetmirror.com/Downloads/MySQL-4.0/ \
+	http://mysql.holywar.net/Downloads/MySQL-4.0/ \
+	http://netmirror.org/mirror/mysql.com/Downloads/MySQL-4.0/ \
+	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_CAT := zcat
+PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_IPK := $(PACKAGE_DIR)/libmysqlclient_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+
+
+$(DL_DIR)/$(PKG_SOURCE_FILE):
+	mkdir -p $(DL_DIR)
+	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
+
+$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
+	mkdir -p $(TOOL_BUILD_DIR)
+	rm -rf $(PKG_BUILD_DIR)
+	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PATCH) $(PKG_BUILD_DIR) ./patches
+	cp -fpR ./ipkg $(PKG_BUILD_DIR)/
+	chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
+	touch $(PKG_BUILD_DIR)/ipkg/rules
+
+$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules
+	cd $(PKG_BUILD_DIR); \
+	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+	INSTALL_DIR="$(STAGING_DIR)" \
+	./ipkg/rules package
+
+$(IPKG_STATE_DIR)/info/libmysqlclient.list: $(PKG_IPK)
+	$(IPKG) install $(PKG_IPK)
+
+source: $(DL_DIR)/$(PKG_SOURCE_FILE)
+prepare: $(PKG_BUILD_DIR)/ipkg/rules
+compile: $(PKG_IPK)
+install: $(IPKG_STATE_DIR)/info/libmysqlclient.list
+
+clean:
+	-cd $(PKG_BUILD_DIR); \
+	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+	INSTALL_DIR="$(STAGING_DIR)" \
+	./ipkg/rules clean
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_IPK)
+

package/mysql/ipkg/libmysqlclient-dev/CONTROL/control

@@ -0,0 +1,8 @@
+Package: libmysqlclient-dev
+Priority: optional
+Section: devel
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://nthill.free.fr/openwrt/sources/mysql/
+Description: MySQL client library (development)

package/mysql/ipkg/libmysqlclient/CONTROL/control

@@ -0,0 +1,9 @@
+Package: libmysqlclient
+Priority: optional
+Section: libs
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://nthill.free.fr/openwrt/sources/mysql/
+Description: MySQL client library
+Depends: zlib

package/mysql/ipkg/mysql-utils/CONTROL/control

@@ -0,0 +1,9 @@
+Package: mysql-utils
+Priority: optional
+Section: admin
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://nthill.free.fr/openwrt/sources/mysql/
+Description: some MySQL client utilities
+Depends: libmysqlclient, zlib

package/mysql/ipkg/rules

@@ -0,0 +1,191 @@
+#!/usr/bin/make -f
+
+ifneq ($(strip ${IPKG_RULES_INC}),)
+ include $(IPKG_RULES_INC)
+endif
+
+##
+
+PKG_VERSION := $(shell cat ./ipkg/version)
+CURRENT_DIR := $(shell pwd)
+INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install
+
+unexport INSTALL_DIR
+
+I_LIBMYSQLCLIENT := ipkg/libmysqlclient
+I_LIBMYSQLCLIENT_DEV := ipkg/libmysqlclient-dev
+I_MYSQL_UTILS := ipkg/mysql-utils
+
+BUILD_DEPS := \
+	$(STAGING_DIR)/usr/include/ncurses.h \
+#	$(STAGING_DIR)/usr/include/zlib.h \
+
+CONFIGURE_OPTS = \
+	--enable-shared \
+	--enable-static \
+	--disable-assembler \
+	--with-pthread \
+	--without-raid \
+	--with-unix-socket-path=/tmp \
+	--without-libwrap \
+	--without-pstack \
+	--with-low-memory \
+	--without-server \
+	--without-embedded-server \
+	--without-query-cache \
+	--without-mysqlfs \
+	--without-vio \
+	--without-openssl \
+	--without-docs \
+	--without-bench \
+	--without-readline \
+
+##
+
+all: package
+
+
+.stamp-configured: $(BUILD_DEPS)
+
+	touch configure.in 
+	touch aclocal.m4 
+	touch Makefile.in
+	touch config.h.in
+	touch configure
+
+	rm -rf config.cache
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="-I$(STAGING_DIR)/usr/include" \
+	LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+	OPTIMIZE_CFLAGS="$(TARGET_CFLAGS)" \
+	OPTIMIZE_CXXFLAGS="$(TARGET_CFLAGS)" \
+	ac_atomic_add=yes \
+	ac_atomic_sub=yes \
+	ac_cv_sys_restartable_syscalls=yes \
+	ac_cv_conv_longlong_to_float=yes \
+	mysql_cv_compress=yes \
+	mysql_cv_gethostname_style=glibc2 \
+	./configure \
+	  --target=$(GNU_TARGET_NAME) \
+	  --host=$(GNU_TARGET_NAME) \
+	  --build=$(GNU_HOST_NAME) \
+	  --program-prefix="" \
+	  --program-suffix="" \
+	  --prefix=/usr \
+	  --exec-prefix=/usr \
+	  --bindir=/usr/bin \
+	  --datadir=/usr/share \
+	  --includedir=/usr/include \
+	  --infodir=/usr/share/info \
+	  --libdir=/usr/lib \
+	  --libexecdir=/usr/lib \
+	  --localstatedir=/var \
+	  --mandir=/usr/share/man \
+	  --sbindir=/usr/sbin \
+	  --sysconfdir=/etc \
+	  $(DISABLE_LARGEFILE) \
+	  $(DISABLE_NLS) \
+	  $(CONFIGURE_OPTS) \
+
+	touch .stamp-configured
+
+
+.stamp-built: .stamp-configured
+
+	$(MAKE) -C "libmysql" \
+	  CC="$(HOSTCC)" \
+	  LINK="$(HOSTCC) -o conf_to_src -lc" \
+	  CFLAGS="" \
+	 conf_to_src
+
+	$(MAKE) \
+	  SUBDIRS="include libmysql" \
+	 all
+
+	$(MAKE) -C "client" mysqladmin mysqlshow
+
+	touch .stamp-built
+
+
+$(INSTALL_DIR)/usr/include/mysql/mysql.h: .stamp-built
+
+	mkdir -p $(INSTALL_DIR)
+
+	$(MAKE) \
+	  DESTDIR="$(INSTALL_DIR)" \
+	  SUBDIRS="include libmysql" \
+	 install
+	 
+	$(MAKE) -C "client" \
+	  DESTDIR="$(INSTALL_DIR)" \
+	  bin_PROGRAMS="mysqladmin mysqlshow" \
+	 install
+
+
+configure: .stamp-configured
+
+
+build: .stamp-built
+
+
+install: $(INSTALL_DIR)/usr/include/mysql/mysql.h
+
+
+package: $(INSTALL_DIR)/usr/include/mysql/mysql.h
+
+	mkdir -p $(I_LIBMYSQLCLIENT)/usr/lib/
+	cp -fpR $(INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(I_LIBMYSQLCLIENT)/usr/lib/
+	$(STRIP) $(I_LIBMYSQLCLIENT)/usr/lib/libmysqlclient.so.*
+
+	mkdir -p $(I_LIBMYSQLCLIENT_DEV)/usr/include
+	cp -fpR $(INSTALL_DIR)/usr/include/mysql $(I_LIBMYSQLCLIENT_DEV)/usr/include/
+	mkdir -p $(I_LIBMYSQLCLIENT_DEV)/usr/lib/mysql
+	cp -fpR $(INSTALL_DIR)/usr/lib/mysql/libmysqlclient.a $(I_LIBMYSQLCLIENT_DEV)/usr/lib/mysql/
+	cp -fpR $(INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so* $(I_LIBMYSQLCLIENT_DEV)/usr/lib/mysql/
+	
+	mkdir -p $(I_MYSQL_UTILS)/usr/bin
+	cp -fpR $(INSTALL_DIR)/usr/bin/mysqladmin $(I_MYSQL_UTILS)/usr/bin/
+	cp -fpR $(INSTALL_DIR)/usr/bin/mysqlshow $(I_MYSQL_UTILS)/usr/bin/
+	$(STRIP) $(I_MYSQL_UTILS)/usr/bin/*
+
+	chmod 0755 ipkg/*/CONTROL/
+	chmod 0644 ipkg/*/CONTROL/control
+
+	perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control
+ifneq ($(strip $(PKG_VERSION)),)
+	perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control
+endif
+
+	$(IPKG_BUILD) $(I_LIBMYSQLCLIENT) $(IPKG_TARGET_DIR)
+	$(IPKG_BUILD) $(I_LIBMYSQLCLIENT_DEV) $(IPKG_TARGET_DIR)
+	$(IPKG_BUILD) $(I_MYSQL_UTILS) $(IPKG_TARGET_DIR)
+
+
+clean:
+
+	-$(MAKE) -C "client" \
+	  DESTDIR="$(INSTALL_DIR)" \
+	  bin_PROGRAMS="mysqladmin mysqlshow" \
+	 uninstall
+
+	-$(MAKE) \
+	  DESTDIR="$(INSTALL_DIR)" \
+	 uninstall clean
+	
+	rm -rf .stamp-* \
+	  $(I_LIBMYSQLCLIENT)/usr \
+	  $(I_LIBMYSQLCLIENT_DEV)/usr \
+	  $(I_MYSQL_UTILS)/usr \
+
+
+control:
+
+	@cat $(I_LIBMYSQLCLIENT)/CONTROL/control
+	@echo
+	@cat $(I_LIBMYSQLCLIENT_DEV)/CONTROL/control
+	@echo
+	@cat $(I_MYSQL_UTILS)/CONTROL/control
+	@echo
+	
+
+.PHONY: configure build install package clean control

package/mysql/ipkg/version

@@ -0,0 +1 @@
+4.0.24-2

package/postgresql/Config.in

@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBPQ
+	tristate "libpq (PostgreSQL client library)"
+	default m
+	help
+	  PostgreSQL client library.
+	  
+	  http://www.postgresql.org/
+	  
+

package/postgresql/Makefile

@@ -0,0 +1,57 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME := postgresql
+PKG_VERSION := 7.4.6
+PKG_RELEASE := 3
+PKG_MD5SUM := f0ea2b372a7bdaf2613e92176ebf5e0f
+
+PKG_SOURCE_SITE := \
+	ftp://ftp3.us.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/ \
+	ftp://ftp.br.postgresql.org/pub/PostgreSQL/source/v$(PKG_VERSION)/ \
+	ftp://ftp.au.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/ \
+	ftp://ftp.tw.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/ \
+	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_CAT := bzcat
+PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_IPK := $(PACKAGE_DIR)/libpq_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+
+
+$(DL_DIR)/$(PKG_SOURCE_FILE):
+	mkdir -p $(DL_DIR)
+	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
+
+$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
+	mkdir -p $(TOOL_BUILD_DIR)
+	rm -rf $(PKG_BUILD_DIR)
+	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PATCH) $(PKG_BUILD_DIR) ./patches
+	cp -fpR ./ipkg $(PKG_BUILD_DIR)/
+	chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
+	touch $(PKG_BUILD_DIR)/ipkg/rules
+
+$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules
+	cd $(PKG_BUILD_DIR); \
+	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+	INSTALL_DIR="$(STAGING_DIR)" \
+	./ipkg/rules package
+
+$(IPKG_STATE_DIR)/info/libpq.list: $(PKG_IPK)
+	$(IPKG) install $(PKG_IPK)
+
+source: $(DL_DIR)/$(PKG_SOURCE_FILE)
+prepare: $(PKG_BUILD_DIR)/ipkg/rules
+compile: $(PKG_IPK)
+install: $(IPKG_STATE_DIR)/info/libpq.list
+
+clean:
+	-cd $(PKG_BUILD_DIR); \
+	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+	INSTALL_DIR="$(STAGING_DIR)" \
+	./ipkg/rules clean
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_IPK)
+

package/postgresql/ipkg/libpq-dev/CONTROL/control

@@ -0,0 +1,8 @@
+Package: libpq-dev
+Priority: optional
+Section: devel
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://nthill.free.fr/openwrt/sources/postgresql/
+Description: PostgreSQL development package

package/postgresql/ipkg/libpq/CONTROL/control

@@ -0,0 +1,8 @@
+Package: libpq
+Priority: optional
+Section: libs
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://nthill.free.fr/openwrt/sources/postgresql/
+Description: PostgreSQL client library

package/postgresql/ipkg/pgsql-utils/CONTROL/control

@@ -0,0 +1,9 @@
+Package: pgsql-utils
+Priority: optional
+Section: libs
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://nthill.free.fr/openwrt/sources/postgresql/
+Description: some PostgreSQL client utilities
+Depends: libpq

package/postgresql/ipkg/rules

@@ -0,0 +1,150 @@
+#!/usr/bin/make -f
+
+ifneq ($(strip ${IPKG_RULES_INC}),)
+ include $(IPKG_RULES_INC)
+endif
+
+##
+
+PKG_VERSION := $(shell cat ./ipkg/version)
+CURRENT_DIR := $(shell pwd)
+INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install
+
+unexport INSTALL_DIR
+
+I_LIBPQ := ipkg/libpq
+I_LIBPQ_DEV := ipkg/libpq-dev
+I_PGSQL_UTILS := ipkg/pgsql-utils
+
+BUILD_DEPS := \
+#	$(STAGING_DIR)/usr/include/zlib.h \
+
+CONFIGURE_OPTS = \
+	--enable-shared \
+	--enable-static \
+	--disable-integer-datetimes \
+	--disable-rpath \
+	--without-tcl \
+	--without-tk \
+	--without-perl \
+	--without-python \
+	--without-java \
+	--without-krb4 \
+	--without-krb5 \
+	--without-pam \
+	--without-openssl \
+	--without-rendezvous \
+	--without-readline \
+	--with-zlib \
+
+##
+
+all: package
+
+
+.stamp-configured: $(BUILD_DEPS)
+
+	rm -rf config.cache
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	./configure \
+	  --target=$(GNU_TARGET_NAME) \
+	  --host=$(GNU_TARGET_NAME) \
+	  --build=$(GNU_HOST_NAME) \
+	  --prefix=/usr \
+	  --exec-prefix=/usr \
+	  --bindir=/usr/bin \
+	  --datadir=/usr/share \
+	  --includedir=/usr/include \
+	  --libdir=/usr/lib \
+	  --libexecdir=/usr/lib \
+	  --localstatedir=/var \
+	  --mandir=/usr/share/man \
+	  --sbindir=/usr/sbin \
+	  --sysconfdir=/etc \
+	  $(DISABLE_LARGEFILE) \
+	  $(DISABLE_NLS) \
+	  $(CONFIGURE_OPTS) \
+
+	touch .stamp-configured
+
+
+.stamp-built: .stamp-configured
+
+	$(MAKE) 
+
+	touch .stamp-built
+
+
+$(INSTALL_DIR)/usr/bin/psql: .stamp-built
+
+	mkdir -p $(INSTALL_DIR)
+
+	$(MAKE) \
+	  DESTDIR="$(INSTALL_DIR)" \
+	 install
+	 
+
+configure: .stamp-configured
+
+
+build: .stamp-built
+
+
+install: $(INSTALL_DIR)/usr/bin/psql
+
+
+package: $(INSTALL_DIR)/usr/bin/psql
+
+	mkdir -p $(I_LIBPQ)/usr/lib/
+	cp -fpR $(INSTALL_DIR)/usr/lib/libpq*.so.* $(I_LIBPQ)/usr/lib/
+	$(STRIP) $(I_LIBPQ)/usr/lib/lib*.so.*
+
+	mkdir -p $(I_LIBPQ_DEV)/usr/bin
+	cp -fpR $(INSTALL_DIR)/usr/bin/pg_config $(I_LIBPQ_DEV)/usr/bin/
+	mkdir -p $(I_LIBPQ_DEV)/usr/include
+	cp -fpR $(INSTALL_DIR)/usr/include/* $(I_LIBPQ_DEV)/usr/include/
+	mkdir -p $(I_LIBPQ_DEV)/usr/lib/
+	cp -fpR $(INSTALL_DIR)/usr/lib/lib*.a $(I_LIBPQ_DEV)/usr/lib/
+	cp -fpR $(INSTALL_DIR)/usr/lib/lib*.so* $(I_LIBPQ_DEV)/usr/lib/
+	
+	mkdir -p $(I_PGSQL_UTILS)/usr/bin
+	cp -fpR $(INSTALL_DIR)/usr/bin/psql $(I_PGSQL_UTILS)/usr/bin/
+	$(STRIP) $(I_PGSQL_UTILS)/usr/bin/*
+
+	chmod 0755 ipkg/*/CONTROL/
+	chmod 0644 ipkg/*/CONTROL/control
+
+	perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control
+ifneq ($(strip $(PKG_VERSION)),)
+	perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control
+endif
+
+	$(IPKG_BUILD) $(I_LIBPQ) $(IPKG_TARGET_DIR)
+	$(IPKG_BUILD) $(I_LIBPQ_DEV) $(IPKG_TARGET_DIR)
+	$(IPKG_BUILD) $(I_PGSQL_UTILS) $(IPKG_TARGET_DIR)
+
+
+clean:
+
+	$(MAKE) \
+	  DESTDIR="$(INSTALL_DIR)" \
+	 uninstall clean
+
+	rm -rf .stamp-* \
+	  $(I_LIBPQ)/usr \
+	  $(I_LIBPQ_DEV)/usr \
+	  $(I_PGSQL_UTILS)/usr \
+
+
+control:
+
+	@cat $(I_LIBPQ)/CONTROL/control
+	@echo
+	@cat $(I_LIBPQ_DEV)/CONTROL/control
+	@echo
+	@cat $(I_PGSQL_UTILS)/CONTROL/control
+	@echo
+	
+
+.PHONY: configure build install package clean control

package/postgresql/ipkg/version

@@ -0,0 +1 @@
+7.4.6-3