[udev] version bump 150 -> 158

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

10 files changed, 80 insertions, 163 deletions

diff --git a/patches/udev-150/0001-Use-utimensat-instead-of-utimes-and-lutimes.patch b/patches/udev-150/0001-Use-utimensat-instead-of-utimes-and-lutimes.patch
deleted file mode 100644
index 8c5ad23e2..000000000
--- a/patches/udev-150/0001-Use-utimensat-instead-of-utimes-and-lutimes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0f76fd4a8f57c474c4fbac0d9d725ec135f4b0ac Mon Sep 17 00:00:00 2001
-From: Jon Ringle <jon@ringle.org>
-Date: Wed, 10 Mar 2010 10:15:20 -0500
-Subject: [PATCH] Use utimensat instead of utimes and lutimes
-
-Signed-off-by: Jon Ringle <jon@ringle.org>
----
- udev/udev-node.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/udev/udev-node.c b/udev/udev-node.c
-index c80a74c..f38a8f8 100644
---- a/udev/udev-node.c
-+++ b/udev/udev-node.c
-@@ -57,7 +57,7 @@ int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mod
- 			preserve = 1;
- 			udev_selinux_lsetfilecon(udev, file, mode);
- 			/* update time stamp when we re-use the node, like on media change events */
--			utimes(file, NULL);
-+			utimensat(AT_FDCWD, file, NULL, 0);
- 		} else {
- 			char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
- 
-@@ -178,7 +178,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
- 					info(udev, "preserve already existing symlink '%s' to '%s'\n",
- 					     slink, target);
- 					udev_selinux_lsetfilecon(udev, slink, S_IFLNK);
--					lutimes(slink, NULL);
-+					utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
- 					goto exit;
- 				}
- 			}
--- 
-1.7.0.2.182.ge007
-
diff --git a/patches/udev-150/udev-150-fix-ppc-build.diff b/patches/udev-150/udev-150-fix-ppc-build.diff
deleted file mode 100644
index 62804fdac..000000000
--- a/patches/udev-150/udev-150-fix-ppc-build.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: add missing #include <linux/types.h>
-
-Without "#include <linux/types.h>" __u32 is undefined in linux/hiddev.h on PPC
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- extras/hid2hci/hid2hci.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: b/extras/hid2hci/hid2hci.c
-===================================================================
---- a/extras/hid2hci/hid2hci.c
-+++ b/extras/hid2hci/hid2hci.c
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <getopt.h>
- #include <sys/ioctl.h>
-+#include <linux/types.h>
- #include <linux/hiddev.h>
- #include <usb.h>
- 
diff --git a/patches/udev-150/udev-150-kernel-headers-dir.diff b/patches/udev-150/udev-150-kernel-headers-dir.diff
deleted file mode 100644
index 728882283..000000000
--- a/patches/udev-150/udev-150-kernel-headers-dir.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: add configure option for kernel header dir
-
-The keymap extra generates code based on linux/input.h. The header file
-used during code generation must be the the one used when compiling.
-By default /usr/include/linux/input.h is used for code generation.
-
-This patch adds a configure option to specify the directory containing the
-kernel headers.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- Makefile.am  |    2 +-
- configure.ac |    5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -565,7 +565,7 @@ udevkeymapforcereldir = $(libexecdir)/ke
- dist_udevkeymapforcerel_DATA = \
- 	extras/keymap/keymaps/force-release/samsung-other
- 
--extras/keymap/keys.txt: /usr/include/linux/input.h
-+extras/keymap/keys.txt: $(KERNEL_HEADERS_DIR)/linux/input.h
- 	mkdir -p extras/keymap
- 	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
- 
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -75,6 +75,11 @@ AC_ARG_ENABLE([modem-modeswitch],
- 	[], [enable_modem_modeswitch=yes])
- AM_CONDITIONAL([ENABLE_MODEM_MODESWITCH], [test "x$enable_modem_modeswitch" = xyes])
- 
-+AC_ARG_WITH([kernel-headers-dir],
-+	AS_HELP_STRING([--with-kernel-headers-dir=DIR], [where to find the kernel headers]),
-+	[kernel_headers=${withval}], [kernel_headers=/usr/include])
-+AC_SUBST([KERNEL_HEADERS_DIR], [$kernel_headers])
-+
- if test "x$enable_keymap" = xyes; then
- 	AC_PATH_PROG([GPERF], [gperf])
- 	if test -z "$GPERF"; then
diff --git a/patches/udev-150/autogen.sh b/patches/udev-158/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/udev-150/autogen.sh
+++ b/patches/udev-158/autogen.sh
diff --git a/patches/udev-158/remove-SOCK_CLOEXEC.diff b/patches/udev-158/remove-SOCK_CLOEXEC.diff
new file mode 100644
index 000000000..d9cb3ef4e
--- /dev/null
+++ b/patches/udev-158/remove-SOCK_CLOEXEC.diff
@@ -0,0 +1,30 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: HACK: remove SOCK_CLOEXEC usage
+
+SOCK_CLOEXEC is not supported by OSELAS.Toolchain-1.99.3
+
+Not for upstream.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ udev/udevd.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: b/udev/udevd.c
+===================================================================
+--- a/udev/udevd.c
++++ b/udev/udevd.c
+@@ -979,10 +979,11 @@ static int init_notify(const char *state
+ 		goto finish;
+ 	}
+ 
+-	if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
++	if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) {
+ 		r = -errno;
+ 		goto finish;
+ 	}
++	util_set_fd_cloexec(fd);
+ 
+ 	memset(&sockaddr, 0, sizeof(sockaddr));
+ 	sockaddr.sa.sa_family = AF_UNIX;
diff --git a/patches/udev-150/series b/patches/udev-158/series
index fa53e88ff..cbfcdab6c 100644
--- a/patches/udev-150/series
+++ b/patches/udev-158/series
@@ -2,6 +2,4 @@ udev-150-split-extras.diff
 udev-150-revert-SOCK_CLOEXEC.diff
 udev-150-revert-bsg_h-removal.diff
 udev-150-remove-le16toh.diff
-udev-150-fix-ppc-build.diff
-udev-150-kernel-headers-dir.diff
-0001-Use-utimensat-instead-of-utimes-and-lutimes.patch
+remove-SOCK_CLOEXEC.diff
diff --git a/patches/udev-150/udev-150-remove-le16toh.diff b/patches/udev-158/udev-150-remove-le16toh.diff
index 7794bcf1b..7794bcf1b 100644
--- a/patches/udev-150/udev-150-remove-le16toh.diff
+++ b/patches/udev-158/udev-150-remove-le16toh.diff
diff --git a/patches/udev-150/udev-150-revert-SOCK_CLOEXEC.diff b/patches/udev-158/udev-150-revert-SOCK_CLOEXEC.diff
index 417a0ee12..c3fa33c98 100644
--- a/patches/udev-150/udev-150-revert-SOCK_CLOEXEC.diff
+++ b/patches/udev-158/udev-150-revert-SOCK_CLOEXEC.diff
@@ -48,9 +48,9 @@ index c2fff00..6738a9b 100644
  int udev_util_replace_chars(char *str, const char *white);
  int udev_util_encode_string(const char *str, char *str_enc, size_t len);
 +void util_set_fd_cloexec(int fd);
- unsigned int util_string_hash32(const char *str);
+ unsigned int util_string_hash32(const char *key);
+ uint64_t util_string_bloom64(const char *str);
  
- /* libudev-util-private.c */
 diff --git a/libudev/libudev-util.c b/libudev/libudev-util.c
 index c0209f9..9a656b5 100644
 --- a/libudev/libudev-util.c
diff --git a/patches/udev-150/udev-150-revert-bsg_h-removal.diff b/patches/udev-158/udev-150-revert-bsg_h-removal.diff
index f6e57a9d5..f6e57a9d5 100644
--- a/patches/udev-150/udev-150-revert-bsg_h-removal.diff
+++ b/patches/udev-158/udev-150-revert-bsg_h-removal.diff
diff --git a/patches/udev-150/udev-150-split-extras.diff b/patches/udev-158/udev-150-split-extras.diff
index abc162d21..28350f5f7 100644
--- a/patches/udev-150/udev-150-split-extras.diff
+++ b/patches/udev-158/udev-150-split-extras.diff
@@ -17,15 +17,15 @@ as configure options
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 
 ---
- Makefile.am  |   25 +++++++++++++++++----
- configure.ac |   69 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
- 2 files changed, 78 insertions(+), 16 deletions(-)
+ Makefile.am  |   25 +++++++++++++++++++++----
+ configure.ac |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
+ 2 files changed, 71 insertions(+), 13 deletions(-)
 
 Index: b/Makefile.am
 ===================================================================
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -288,7 +288,8 @@ extras_v4l_id_v4l_id_LDADD = libudev/lib
+@@ -284,7 +284,8 @@ extras_v4l_id_v4l_id_LDADD = libudev/lib
  libexec_PROGRAMS += extras/v4l_id/v4l_id
  dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
  
@@ -35,7 +35,7 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # conditional extras (need glib, libusb, libacl, ...)
  # ------------------------------------------------------------------------------
-@@ -296,7 +297,12 @@ dist_udevrules_DATA += \
+@@ -292,7 +293,12 @@ dist_udevrules_DATA += \
  	rules/rules.d/75-net-description.rules \
  	rules/rules.d/75-tty-description.rules \
  	rules/rules.d/78-sound-card.rules
@@ -48,7 +48,7 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # GUdev - libudev gobject interface
  # ------------------------------------------------------------------------------
-@@ -334,7 +340,7 @@ dist_extras_gudev_libgudev_1_0_la_SOURCE
+@@ -330,7 +336,7 @@ dist_extras_gudev_libgudev_1_0_la_SOURCE
  	extras/gudev/gudevmarshal.c \
  	extras/gudev/gudevenumtypes.h \
  	extras/gudev/gudevenumtypes.c
@@ -57,7 +57,7 @@ Index: b/Makefile.am
  
  extras_gudev_libgudev_1_0_la_CPPFLAGS = \
  	$(AM_CPPFLAGS) \
-@@ -410,7 +416,9 @@ typelibs_DATA = extras/gudev/GUdev-1.0.t
+@@ -407,7 +413,9 @@ typelibs_DATA = extras/gudev/GUdev-1.0.t
  
  CLEANFILES += $(gir_DATA) $(typelibs_DATA)
  endif # ENABLE_INTROSPECTION
@@ -67,7 +67,7 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # Bluetooth HID devices with special magic to switch the device
  # ------------------------------------------------------------------------------
-@@ -419,7 +427,9 @@ extras_hid2hci_hid2hci_CPPFLAGS = $(AM_C
+@@ -416,7 +424,9 @@ extras_hid2hci_hid2hci_CPPFLAGS = $(AM_C
  extras_hid2hci_hid2hci_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
  dist_udevrules_DATA += extras/hid2hci/70-hid2hci.rules
  libexec_PROGRAMS += extras/hid2hci/hid2hci
@@ -77,7 +77,7 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # udev_acl - apply ACLs for users with local forground sessions
  # ------------------------------------------------------------------------------
-@@ -434,7 +444,9 @@ udevacl-install-hook:
+@@ -431,7 +441,9 @@ udevacl-install-hook:
  	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
  
  INSTALL_EXEC_HOOKS += udevacl-install-hook
@@ -87,7 +87,7 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # usb-db - read USB vendor/device string database
  # ------------------------------------------------------------------------------
-@@ -442,7 +454,9 @@ extras_usb_db_usb_db_SOURCES = extras/us
+@@ -439,7 +451,9 @@ extras_usb_db_usb_db_SOURCES = extras/us
  extras_usb_db_usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
  extras_usb_db_usb_db_LDADD = libudev/libudev-private.la
  libexec_PROGRAMS += extras/usb-db/usb-db
@@ -97,27 +97,27 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # pci-db - read PCI vendor/device string database
  # ------------------------------------------------------------------------------
-@@ -450,7 +464,9 @@ extras_usb_db_pci_db_SOURCES = extras/us
+@@ -447,7 +461,9 @@ extras_usb_db_pci_db_SOURCES = extras/us
  extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
  extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
  libexec_PROGRAMS += extras/usb-db/pci-db
 +endif # ENABLE_PCIDB
  
-+if ENABLE_MODEM_MODESWITCH
++if ENABLE_MOBILE_ACTION_MODESWITCH
  # ------------------------------------------------------------------------------
- # modem-modeswitch - magic config switch for 3G modems
+ # mobile-action-modeswitch - switch Mobile Action cables into serial mode
  # ------------------------------------------------------------------------------
-@@ -470,7 +486,9 @@ dist_udevrules_DATA += \
- 	extras/modem-modeswitch/61-mobile-action.rules
+@@ -464,7 +480,9 @@ dist_udevrules_DATA += \
+ 	extras/mobile-action-modeswitch/61-mobile-action.rules
  
- libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
-+endif # ENABLE_MODEM_MODESWITCH
+ libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
++endif # ENABLE_MOBILE_ACTION_MODESWITCH
  
 +if ENABLE_KEYMAP
  # ------------------------------------------------------------------------------
- # keymap - map custom hardware's multimedia keys
+ # mtd_probe - autoloads FTL module for mtd devices
  # ------------------------------------------------------------------------------
-@@ -562,8 +580,7 @@ extras/keymap/keys-to-name.h: extras/key
+@@ -574,8 +592,7 @@ extras/keymap/keys-to-name.h: extras/key
  keymaps-distcheck-hook: extras/keymap/keys.txt
  	$(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
  DISTCHECK_HOOKS = keymaps-distcheck-hook
@@ -131,9 +131,9 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -46,32 +46,72 @@ if test "x$enable_logging" = "xyes"; the
- 	AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
- fi
+@@ -64,29 +64,68 @@ done
+ IFS=$OLD_IFS
+ AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
  
 -AC_ARG_ENABLE([extras],
 -	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
@@ -163,61 +163,54 @@ Index: b/configure.ac
 +	AS_HELP_STRING([--disable-pcidb], [disable pci-db - read PCI vendor/device string database]),
 +	[], [enable_pcidb=yes])
 +AM_CONDITIONAL([ENABLE_PCIDB], [test "x$enable_pcidb" = xyes])
-+AC_ARG_ENABLE([modem-modeswitch],
-+	AS_HELP_STRING([--disable-modem-modeswitch], [disable modem-modeswitch - magic config switch for 3G modems]),
-+	[], [enable_modem_modeswitch=yes])
-+AM_CONDITIONAL([ENABLE_MODEM_MODESWITCH], [test "x$enable_modem_modeswitch" = xyes])
++AC_ARG_ENABLE([mobile-action-modeswitch],
++	AS_HELP_STRING([--disable-mobile-action-modeswitch], [disable mobile-action-modeswitch - switch Mobile Action cables into serial mode]),
++	[], [enable_mobile_action_modeswitch=yes])
++AM_CONDITIONAL([ENABLE_MOBILE_ACTION_MODESWITCH], [test "x$enable_mobile_action_modeswitch" = xyes])
 +
 +if test "x$enable_keymap" = xyes; then
  	AC_PATH_PROG([GPERF], [gperf])
  	if test -z "$GPERF"; then
  		AC_MSG_ERROR([gperf is needed])
  	fi
-+fi
  
++	AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
++	AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
++fi
++
 +if test "x$enable_gudev" = xyes -o "x$enable_acl" = xyes; then
  	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
  	AC_SUBST([GLIB_CFLAGS])
  	AC_SUBST([GLIB_LIBS])
 +fi
  
--	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
--	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
--
-+if test "x$enable_bluetooth" = xyes -o "x$enable_modem_modeswitch" = xyes; then
++if test "x$enable_acl" = xyes; then
+ 	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
+ 	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
++fi
+ 
++if test "x$enable_bluetooth" = xyes -o "x$enable_mobile_action_modeswitch" = xyes; then
  	PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
  	AC_SUBST(LIBUSB_CFLAGS)
  	AC_SUBST(LIBUSB_LIBS)
 +fi
  
-+if test "x$enable_acl" = xyes; then
-+	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
-+	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
-+fi
-+
 +if test "x$enable_usbdb" = xyes; then
  	PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
  	AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
-+else
-+	USB_DATABASE=no
 +fi
  
--	AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
--	AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
--	AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
 +if test "x$enable_pcidb" = xyes; then
-+	if test "x$cross_compiling" != xyes; then
-+		AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
-+		AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
-+		AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
-+	fi
- 	AC_ARG_WITH(pci-ids-path,
- 		AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
- 		[PCI_DATABASE=${withval}],
-@@ -81,8 +121,9 @@ if test "x$enable_extras" = xyes; then
- 			AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=])
- 		fi])
+ 	if test "x$cross_compiling" = "xno" ; then
+ 		AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
+ 		AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
+@@ -103,11 +142,9 @@ if test "x$enable_extras" = xyes; then
+ 	AC_MSG_CHECKING([for PCI database location])
+ 	AC_MSG_RESULT([$PCI_DATABASE])
  	AC_SUBST(PCI_DATABASE)
+-
+-	AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
+-	AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
 +else
 +	PCI_DATABASE=no
  fi
@@ -225,7 +218,7 @@ Index: b/configure.ac
  
  AC_ARG_ENABLE([introspection],
  	AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
-@@ -134,7 +175,11 @@ AC_MSG_RESULT([
+@@ -161,7 +198,11 @@ AC_MSG_RESULT([
  	cflags:			${CFLAGS}
  	ldflags:		${LDFLAGS}
  
@@ -234,7 +227,7 @@ Index: b/configure.ac
 +	bluetooth:		${enable_bluetooth}
 +	keymap:			${enable_keymap}
 +	acl:			${enable_acl}
-+	modem-modeswitch:	${enable_modem_modeswitch}
++	mobile-action-modeswitch:	${enable_mobile_action_modeswitch}
  	gintrospection:		${enable_introspection}
  
  	usb.ids:		${USB_DATABASE}