summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--package/samba/samba.mk2
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 3f18ec66c..2e4cdeb39 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,7 +17,7 @@
libaio,libdrm, libgcrypt, libglib2, libpng, libxml2, matchbox,
mdadm, memstat, mesa3d, mtd-utils, nano, openssl, pciutils,
php, pixman, portage, pppd, pthread-stubs, python, qt, radvd,
- setserial, squashfs, tslib, usb_modeswith, wget,
+ samba, setserial, squashfs, tslib, usb_modeswith, wget,
xdriver_xf86-video-intel, xkeyboard-config, xlib_libX11,
xlib_libXaw, xlib_libXfont, xlib_libXfontcache, xlib_libXxf86misc,
xlib_libpciaccess, xproto_dri2proto, xproto_eviext,
@@ -62,6 +62,7 @@
#1513: Enable powerpc e300c2, e300c3 and e500mc optimization
#1537: dev entries not created anymore
#1555: Fix default uclibc-0.9.31 configuration
+ #1561: [SECURITY] Update samba to 3.3.12
#1567: openssl0.9.8n fails to compile
#1591: portmap fails to compile
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 9ff2bb13b..411536302 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -3,7 +3,7 @@
# samba
#
#############################################################
-SAMBA_VERSION:=3.3.8
+SAMBA_VERSION:=3.3.12
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
SAMBA_SITE:=http://samba.org/samba/ftp/stable/