[arch-commits] Commit in samba/trunk (PKGBUILD readline-6.3.patch)

[Tobias Powalowski]

    Date: Thursday, April 17, 2014 @ 22:12:31
  Author: tpowa
Revision: 211158

upgpkg: samba 4.1.7-1

bump to latest version

Modified:
  samba/trunk/PKGBUILD
Deleted:
  samba/trunk/readline-6.3.patch

--------------------+
 PKGBUILD           |   22 ++++------------------
 readline-6.3.patch |   26 --------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-17 20:02:05 UTC (rev 211157)
+++ PKGBUILD	2014-04-17 20:12:31 UTC (rev 211158)
@@ -10,11 +10,11 @@
 
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.1.6
+pkgver=4.1.7
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=4.1.6
+_realver=4.1.7
 pkgrel=1
 arch=(i686 x86_64)
 url="http://www.samba.org"
@@ -32,8 +32,7 @@
         nmbd.service
         smbd at .service
         winbindd.service
-        samba.conf
-        readline-6.3.patch)
+        samba.conf)
 ### UNINSTALL dmapi package before building!!!
 
 build() {
@@ -63,7 +62,6 @@
 _samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4
 _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4
  cd ${srcdir}/samba-${_realver}
-  patch -Np1 -i ${srcdir}/readline-6.3.patch
   ./configure --enable-fhs \
               --prefix=/usr \
               --sbindir=/usr/bin \
@@ -242,7 +240,7 @@
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('9dc64658c0cc81e7637f9b975c19638c'
+md5sums=('bc44b0a245468c3574ef07644206ede3'
          '5697da77590ec092cc8a883bae06093c'
          '96f82c38f3f540b53f3e5144900acf17'
          'ee4763a656cf00d92bfda31b6bb2c5cb'
@@ -253,15 +251,3 @@
          '70afd2db60a2e8eff7615dbdecd887ac'
          'd5f56f43e1280bba20f6bbd88d16fa41'
          '49abd7b719e3713a3f75a8a50958e381')
-md5sums=('9dc64658c0cc81e7637f9b975c19638c'
-         '5697da77590ec092cc8a883bae06093c'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'ee4763a656cf00d92bfda31b6bb2c5cb'
-         '6c447748a064d631435dbef0a3dcf32f'
-         'e4ae6a3cac080602120aa151918c4a36'
-         'a78b9aa93eb14b0ac445897395693225'
-         'df6380c73cb73163968eabc8650f7358'
-         '70afd2db60a2e8eff7615dbdecd887ac'
-         'd5f56f43e1280bba20f6bbd88d16fa41'
-         '49abd7b719e3713a3f75a8a50958e381'
-         '1179c1dcdb95f79b0d5813698d010d2c')

Deleted: readline-6.3.patch
===================================================================
--- readline-6.3.patch	2014-04-17 20:02:05 UTC (rev 211157)
+++ readline-6.3.patch	2014-04-17 20:12:31 UTC (rev 211158)
@@ -1,26 +0,0 @@
-Function, CPFunction, CPPFunction and VFunction typedefs are considered
-old-style (deprecated) starting from readline 4.2.
-Compatibility typedefs have been in place up to readline 6.2 but were
-removed with the 6.3 release thus causing builds to break.
-Swtich to the new-style specific prototyped typedef.
-
-Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
----
- libcli/smbreadline/smbreadline.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcli/smbreadline/smbreadline.c b/libcli/smbreadline/smbreadline.c
-index cff25a7..80e10b0 100644
---- a/libcli/smbreadline/smbreadline.c
-+++ b/libcli/smbreadline/smbreadline.c
-@@ -141,7 +141,7 @@ char *smb_readline(const char *prompt, void (*callback)(void),
- 
- #if HAVE_DECL_RL_EVENT_HOOK
- 	if (callback)
--		rl_event_hook = (Function *)callback;
-+		rl_event_hook = (rl_hook_func_t *)callback;
- #endif
- 	ret = readline(prompt);
- 	if (ret && *ret)
--- 
-1.8.3.2