[arch-commits] Commit in ctags/trunk (CVE-2014-7204.patch PKGBUILD)

[Levente Polyak]

    Date: Monday, October 15, 2018 @ 21:57:36
  Author: anthraxx
Revision: 336581

upgpkg: ctags 1:r20181015+g45968eff-1 (replace by universal-ctags)

Modified:
  ctags/trunk/PKGBUILD
Deleted:
  ctags/trunk/CVE-2014-7204.patch

---------------------+
 CVE-2014-7204.patch |  102 --------------------------------------------------
 PKGBUILD            |   52 +++++++++++++++----------
 2 files changed, 32 insertions(+), 122 deletions(-)

Deleted: CVE-2014-7204.patch
===================================================================
--- CVE-2014-7204.patch	2018-10-15 21:12:56 UTC (rev 336580)
+++ CVE-2014-7204.patch	2018-10-15 21:57:36 UTC (rev 336581)
@@ -1,102 +0,0 @@
-From a499a10833d525c9af794c616dc40f7425110c71 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson at debian.org>
-Date: Sat, 27 Sep 2014 14:37:19 +0100
-Subject: Changed the javascript parser to set the tag's scope rather than
- including it in the tag name.
-
-Patch from Colomban.
-
-Author: David Fishburn
-Origin: upstream, http://sourceforge.net/p/ctags/code/791/
-Bug-Debian: https://bugs.debian.org/742605
-Last-Update: 2014-09-27
-
-Patch-Name: jscript-set-tag-scope.patch
----
- jscript.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 51 insertions(+), 3 deletions(-)
-
-diff --git a/jscript.c b/jscript.c
-index 5de3367..a790355 100644
---- a/jscript.c
-+++ b/jscript.c
-@@ -215,6 +215,7 @@ static void deleteToken (tokenInfo *const token)
-  *	 Tag generation functions
-  */
- 
-+/*
- static void makeConstTag (tokenInfo *const token, const jsKind kind)
- {
- 	if (JsKinds [kind].enabled && ! token->ignoreTag )
-@@ -238,12 +239,13 @@ static void makeJsTag (tokenInfo *const token, const jsKind kind)
- 
- 	if (JsKinds [kind].enabled && ! token->ignoreTag )
- 	{
--		/*
-+		*
- 		 * If a scope has been added to the token, change the token
- 		 * string to include the scope when making the tag.
--		 */
-+		 *
- 		if ( vStringLength(token->scope) > 0 )
- 		{
-+			*
- 			fulltag = vStringNew ();
- 			vStringCopy(fulltag, token->scope);
- 			vStringCatS (fulltag, ".");
-@@ -251,8 +253,54 @@ static void makeJsTag (tokenInfo *const token, const jsKind kind)
- 			vStringTerminate(fulltag);
- 			vStringCopy(token->string, fulltag);
- 			vStringDelete (fulltag);
-+			*
-+ 			jsKind parent_kind = JSTAG_CLASS;
-+ 
-+ 			* 
-+			 * if we're creating a function (and not a method),
-+ 			 * guess we're inside another function 
-+			 *
-+ 			if (kind == JSTAG_FUNCTION)
-+ 				parent_kind = JSTAG_FUNCTION;
-+ 
-+ 			e.extensionFields.scope[0] = JsKinds [parent_kind].name;
-+ 			e.extensionFields.scope[1] = vStringValue (token->scope);
-+		}
-+		* makeConstTag (token, kind); *
-+ 		makeTagEntry (&e);
-+	}
-+}
-+*/
-+
-+static void makeJsTag (tokenInfo *const token, const jsKind kind)
-+{
-+	if (JsKinds [kind].enabled && ! token->ignoreTag )
-+	{
-+		const char *const name = vStringValue (token->string);
-+		tagEntryInfo e;
-+		initTagEntry (&e, name);
-+
-+		e.lineNumber   = token->lineNumber;
-+		e.filePosition = token->filePosition;
-+		e.kindName	   = JsKinds [kind].name;
-+		e.kind		   = JsKinds [kind].letter;
-+
-+		if ( vStringLength(token->scope) > 0 )
-+		{
-+			jsKind parent_kind = JSTAG_CLASS;
-+
-+			/* 
-+			 * If we're creating a function (and not a method),
-+			 * guess we're inside another function 
-+			 */
-+			if (kind == JSTAG_FUNCTION)
-+				parent_kind = JSTAG_FUNCTION;
-+
-+			e.extensionFields.scope[0] = JsKinds [parent_kind].name;
-+			e.extensionFields.scope[1] = vStringValue (token->scope);
- 		}
--		makeConstTag (token, kind);
-+
-+		makeTagEntry (&e);
- 	}
- }
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-15 21:12:56 UTC (rev 336580)
+++ PKGBUILD	2018-10-15 21:57:36 UTC (rev 336581)
@@ -1,35 +1,47 @@
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=ctags
-pkgver=5.8
-pkgrel=6
-pkgdesc="Generates an index file of language objects found in source files"
+_commit=45968eff8429f8f4942be5701f6c3b794afaf5f3  # master
+pkgver=r20181015+g45968eff
+pkgrel=1
+epoch=1
+pkgdesc='Generates an index file of language objects found in source files'
+url='https://ctags.io/'
 arch=('x86_64')
 license=('GPL')
-depends=('glibc')
-url="http://ctags.sourceforge.net/"
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "CVE-2014-7204.patch")
-sha512sums=('981912cd335978cde22864e977947fc75326572fb29518e559cc4a8ac1edc84b3604165218a666e36353f17da4f89f8e967acdb88696f816748eb946d79eaa15'
-            '7593aa9ca8857b09127a842752d214764734215b42b58c8a44e2a320b21b5a4923dd05a3d14a9053e570f07297d77b3d2fa8f5d41c500e9aadf993413a66be76')
+depends=('libxml2' 'jansson' 'libyaml' 'libseccomp')
+makedepends=('git' 'python-docutils')
+provides=('universal-ctags')
+source=("git+https://github.com/universal-ctags/ctags#commit=$_commit")
+sha512sums=('SKIP')
 
+pkgver() {
+  git -C ctags show --pretty='r%cd+g%h' --date='format:%Y%m%d' --no-patch
+}
+
 prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -Np1 <../CVE-2014-7204.patch
+  cd ctags
+  ./autogen.sh
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr \
-              --disable-external-sort
+  cd ctags
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib
   make
 }
 
+check() {
+  make -C ctags check
+}
+
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  make -C ctags DESTDIR="${pkgdir}" install
+}
 
-  make prefix=${pkgdir}/usr install
-}
+# vim:set sw=2 et: