commit ohcount for openSUSE:Factory
Hello community,
here is the log from the commit of package ohcount for openSUSE:Factory checked
in at 2020-03-26 23:37:59
Comparing /work/SRC/openSUSE:Factory/ohcount (Old)
and /work/SRC/openSUSE:Factory/.ohcount.new.3160 (New)
Package is "ohcount"
Thu Mar 26 23:37:59 2020 rev:2 rq:788668 version:4.0.0
Changes:
--- /work/SRC/openSUSE:Factory/ohcount/ohcount.changes 2019-09-13
14:57:22.585274841 +0200
+++ /work/SRC/openSUSE:Factory/.ohcount.new.3160/ohcount.changes
2020-03-26 23:38:02.894878471 +0100
@@ -1,0 +2,5 @@
+Thu Mar 26 18:31:45 UTC 2020 - Erico Mendonca
+
+- test_null_pointer.patch: adding extra checks for NULL pointers to avoid
segmentation faults.
+
+---
New:
test_null_pointer.patch
Other differences:
--
++ ohcount.spec ++
--- /var/tmp/diff_new_pack.bPrc7w/_old 2020-03-26 23:38:04.838879173 +0100
+++ /var/tmp/diff_new_pack.bPrc7w/_new 2020-03-26 23:38:04.842879174 +0100
@@ -27,6 +27,7 @@
#Git-Clone:git://github.com/blackducksw/ohcount
Source:
https://github.com/blackducksoftware/ohcount/archive/%version.tar.gz
+Patch0: test_null_pointer.patch
Patch1: cflags.diff
BuildRequires: bash
BuildRequires: file-devel
++ test_null_pointer.patch ++
--- ohcount-4.0.0-orig/src/sourcefile.c 2019-02-26 17:39:28.0 -0300
+++ ohcount-4.0.0/src/sourcefile.c 2020-03-26 14:34:32.334582616 -0300
@@ -178,11 +178,11 @@
lang = iter->pl;
}
- if (strcmp(entity, "lcode") == 0) {
+ if ( (p != NULL) && (strcmp(entity, "lcode") == 0) ) {
while (*p == ' ' || *p == '\t') p++;
ohcount_parsed_language_add_code(lang, p, pe - p);
} else if (strcmp(entity, "lcomment") == 0) {
-while (*p == ' ' || *p == '\t') p++;
+while ( (p != NULL) && (*p == ' ' || *p == '\t')) p++;
ohcount_parsed_language_add_comment(lang, p, pe - p);
} else if (strcmp(entity, "lblank") == 0) {
lang->blanks_count++;
commit ohcount for openSUSE:Factory
Hello community,
here is the log from the commit of package ohcount for openSUSE:Factory checked
in at 2014-03-04 13:56:36
Comparing /work/SRC/openSUSE:Factory/ohcount (Old)
and /work/SRC/openSUSE:Factory/.ohcount.new (New)
Package is ohcount
Changes:
--- /work/SRC/openSUSE:Factory/ohcount/ohcount.changes 2013-12-10
17:44:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.ohcount.new/ohcount.changes 2014-03-04
13:56:38.0 +0100
@@ -1,0 +2,6 @@
+Sun Feb 23 13:38:13 UTC 2014 - jeng...@inai.de
+
+- Remove pkgconfig(ruby*) and kill pkgconfig call to unstuck
+ factory build
+
+---
Other differences:
--
++ ohcount.spec ++
--- /var/tmp/diff_new_pack.TME3KA/_old 2014-03-04 13:56:38.0 +0100
+++ /var/tmp/diff_new_pack.TME3KA/_new 2014-03-04 13:56:38.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ohcount
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -37,16 +37,10 @@
BuildRequires: gcc = 4.1.2
BuildRequires: gperf
BuildRequires: pcre-devel
-BuildRequires: pkg-config
BuildRequires: ragel = 6.3
BuildRequires: ruby-devel
BuildRequires: swig
BuildRequires: xz
-%if 0%{?suse_version} 1310
-BuildRequires: pkgconfig(ruby-1.9)
-%else
-BuildRequires: pkgconfig(ruby-2.0)
-%endif
%description
Ohcount supports over 70 popular programming languages, and has been
@@ -69,7 +63,7 @@
%patch -P 1 -P 2 -p1
%build
-export CFLAGS=%optflags $(pkg-config ruby-2.0 --cflags);
+export CFLAGS=%optflags
export SHARED=-Wl,-soname,libohcount.so;
./build ohcount;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ohcount for openSUSE:Factory
Hello community,
here is the log from the commit of package ohcount for openSUSE:Factory checked
in at 2013-12-10 17:44:12
Comparing /work/SRC/openSUSE:Factory/ohcount (Old)
and /work/SRC/openSUSE:Factory/.ohcount.new (New)
Package is ohcount
Changes:
--- /work/SRC/openSUSE:Factory/ohcount/ohcount.changes 2013-06-18
10:20:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.ohcount.new/ohcount.changes 2013-12-10
17:44:16.0 +0100
@@ -1,0 +2,5 @@
+Mon Dec 9 16:31:12 UTC 2013 - jeng...@inai.de
+
+- Build with ruby-2.0 for openSUSE = 13.1
+
+---
Other differences:
--
++ ohcount.spec ++
--- /var/tmp/diff_new_pack.V9o1Nm/_old 2013-12-10 17:44:17.0 +0100
+++ /var/tmp/diff_new_pack.V9o1Nm/_new 2013-12-10 17:44:17.0 +0100
@@ -42,7 +42,11 @@
BuildRequires: ruby-devel
BuildRequires: swig
BuildRequires: xz
+%if 0%{?suse_version} 1310
BuildRequires: pkgconfig(ruby-1.9)
+%else
+BuildRequires: pkgconfig(ruby-2.0)
+%endif
%description
Ohcount supports over 70 popular programming languages, and has been
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ohcount for openSUSE:Factory
Hello community,
here is the log from the commit of package ohcount for openSUSE:Factory checked
in at 2013-06-18 10:20:45
Comparing /work/SRC/openSUSE:Factory/ohcount (Old)
and /work/SRC/openSUSE:Factory/.ohcount.new (New)
Package is ohcount
Changes:
--- /work/SRC/openSUSE:Factory/ohcount/ohcount.changes 2013-04-02
12:32:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.ohcount.new/ohcount.changes 2013-06-18
10:20:46.0 +0200
@@ -1,0 +2,6 @@
+Sun Jun 16 18:33:57 UTC 2013 - jeng...@inai.de
+
+- Remove unbuildable ohcount-ruby subpackage.
+ Remove swig-ruby19.diff (unused).
+
+---
Old:
swig-ruby19.diff
Other differences:
--
++ ohcount.spec ++
--- /var/tmp/diff_new_pack.zV2Ole/_old 2013-06-18 10:20:46.0 +0200
+++ /var/tmp/diff_new_pack.zV2Ole/_new 2013-06-18 10:20:46.0 +0200
@@ -30,8 +30,7 @@
#Git-Clone:git://github.com/blackducksw/ohcount
Source: %name-%version.tar.xz
Patch1: cflags.diff
-Patch2: swig-ruby19.diff
-Patch3: shared.diff
+Patch2: shared.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bash
BuildRequires: file-devel
@@ -61,32 +60,20 @@
The core parsing library for the Ohcount source code analyzer program
and for its ruby bindings.
-%package ruby
-Summary:Ruby bindings for the Ohcount source code analyzer
-Group: Development/Languages/Ruby
-
-%description ruby
-Ruby bindings for the Ohcount source code analyzer.
-
%prep
%setup -qn %name
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -P 2 -p1
%build
-export CFLAGS=%optflags $(pkg-config ruby-1.9 --cflags);
+export CFLAGS=%optflags $(pkg-config ruby-2.0 --cflags);
export SHARED=-Wl,-soname,libohcount.so;
./build ohcount;
-./build ruby;
%install
b=%buildroot;
mkdir -p $b/%_bindir $b/%_libdir;
install -pm0755 bin/ohcount $b/%_bindir/;
install -pm0755 src/libohcount*.so $b/%_libdir/;
-r=$b/%_libdir/ruby/vendor_ruby/$(pkg-config ruby-1.9 --modversion);
-mkdir -p $r;
-cp -a ruby $r/;
-rm -f $r/*.{c,i};
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
@@ -100,8 +87,4 @@
%defattr(-,root,root)
%_libdir/libohcount.so
-%files ruby
-%defattr(-,root,root)
-%_libdir/ruby
-
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ohcount for openSUSE:Factory
Hello community,
here is the log from the commit of package ohcount for openSUSE:Factory checked
in at 2013-04-02 12:32:48
Comparing /work/SRC/openSUSE:Factory/ohcount (Old)
and /work/SRC/openSUSE:Factory/.ohcount.new (New)
Package is ohcount, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/ohcount/ohcount.changes 2012-12-07
14:43:39.0 +0100
+++ /work/SRC/openSUSE:Factory/.ohcount.new/ohcount.changes 2013-04-02
12:32:49.0 +0200
@@ -1,0 +2,8 @@
+Wed Mar 20 12:54:25 UTC 2013 - jeng...@inai.de
+
+- Update to new git snapshot (3.0.0.g)
+* Added support for Genie and Vala .vapi files
+* Detect file import on pp disambiguation
+* Add support for Coq .v files (based on the OCaml parser)
+
+---
Old:
ohcount-3.0.0.g297.tar.xz
New:
ohcount-3.0.0.g312.tar.xz
Other differences:
--
++ ohcount.spec ++
--- /var/tmp/diff_new_pack.gIyV8W/_old 2013-04-02 12:32:52.0 +0200
+++ /var/tmp/diff_new_pack.gIyV8W/_new 2013-04-02 12:32:52.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ohcount
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,9 @@
Name: ohcount
%define lname libohcount
-Version:3.0.0.g297
+Version:3.0.0.g312
Release:0
-# git-describe:2.0.1-297-g6cb04fe
+# git-describe:2.0.1-312-g4fb66a8
Url:http://ohloh.net/p/ohcount
Summary:The Ohloh source code line counter
License:GPL-2.0
@@ -39,7 +39,8 @@
BuildRequires: gperf
BuildRequires: pcre-devel
BuildRequires: pkg-config
-BuildRequires: ragel = 6.3, ruby-devel
+BuildRequires: ragel = 6.3
+BuildRequires: ruby-devel
BuildRequires: swig
BuildRequires: xz
BuildRequires: pkgconfig(ruby-1.9)
@@ -88,7 +89,6 @@
rm -f $r/*.{c,i};
%post -n %lname -p /sbin/ldconfig
-
%postun -n %lname -p /sbin/ldconfig
%files
@@ -96,7 +96,7 @@
%doc COPYING
%_bindir/ohcount
-%files -n libohcount
+%files -n %lname
%defattr(-,root,root)
%_libdir/libohcount.so
++ ohcount-3.0.0.g297.tar.xz - ohcount-3.0.0.g312.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ohcount/src/detector.c new/ohcount/src/detector.c
--- old/ohcount/src/detector.c 2012-11-16 00:07:57.0 +0100
+++ new/ohcount/src/detector.c 2013-03-20 13:53:38.0 +0100
@@ -771,6 +771,8 @@
// strnlen is not available on OS X, so we roll our own
size_t mystrnlen(const char *begin, size_t maxlen) {
+ if (begin == NULL)
+return 0;
const char *end = memchr(begin, '\0', maxlen);
return end ? (end - begin) : maxlen;
}
@@ -778,6 +780,9 @@
const char *disambiguate_pp(SourceFile *sourcefile) {
char *p = ohcount_sourcefile_get_contents(sourcefile);
+ if (!p)
+ return NULL;
+
/* prepare regular expressions */
const char *error;
int erroffset;
@@ -792,7 +797,7 @@
/* check for standard puppet constructs */
pcre *construct;
- construct =
pcre_compile(^\\s*(define\\s+[\\w:-]+\\s*\\(|class\\s+[\\w:-]+(\\s+inherits\\s+[\\w:-]+)?\\s*{|node\\s+\\'?[\\w:\\.-]+\\'?\\s*{),
+ construct =
pcre_compile(^\\s*(define\\s+[\\w:-]+\\s*\\(|class\\s+[\\w:-]+(\\s+inherits\\s+[\\w:-]+)?\\s*{|node\\s+\\'?[\\w:\\.-]+\\'?\\s*{|import\\s+\),
PCRE_MULTILINE, error, erroffset, NULL);
if (pcre_exec(construct, NULL, p, mystrnlen(p, 1), 0, 0, NULL, 0)
-1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ohcount/src/hash/extensions.gperf
new/ohcount/src/hash/extensions.gperf
--- old/ohcount/src/hash/extensions.gperf 2012-11-16 00:07:57.0
+0100
+++ new/ohcount/src/hash/extensions.gperf 2013-03-20 13:53:38.0
+0100
@@ -85,6 +85,7 @@
glsl, LANG_GLSL
go, LANG_GOLANG
groovy, LANG_GROOVY
+gs, LANG_GENIE
gz, BINARY
h, DISAMBIGUATE(h)
h++, LANG_CPP
@@ -203,6 +204,8 @@
tiff, BINARY
tpl, LANG_HTML
vala, LANG_VALA
+vapi, LANG_VALA
+v, LANG_COQ
vb, LANG_VISUALBASIC
vba, LANG_VISUALBASIC
vbs, LANG_VISUALBASIC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ohcount/src/hash/languages.gperf
new/ohcount/src/hash/languages.gperf
--- old/ohcount/src/hash/languages.gperf2012-11-16 00:07:57.0
+0100
+++ new/ohcount/src/hash/languages.gperf2013-03-20 13:53:38.0
+0100
@@ -24,6 +24,7
commit ohcount for openSUSE:Factory
Hello community,
here is the log from the commit of package ohcount for openSUSE:Factory checked
in at 2012-12-07 14:43:37
Comparing /work/SRC/openSUSE:Factory/ohcount (Old)
and /work/SRC/openSUSE:Factory/.ohcount.new (New)
Package is ohcount, Maintainer is
Changes:
New Changes file:
--- /dev/null 2012-11-30 12:21:47.308011256 +0100
+++ /work/SRC/openSUSE:Factory/.ohcount.new/ohcount.changes 2012-12-07
14:43:39.0 +0100
@@ -0,0 +1,4 @@
+---
+Fri Nov 16 01:12:42 UTC 2012 - jeng...@inai.de
+
+- Initial package (version 3.0.0.g297) for build.opensuse.org
New:
cflags.diff
ohcount-3.0.0.g297.tar.xz
ohcount.changes
ohcount.spec
shared.diff
swig-ruby19.diff
Other differences:
--
++ ohcount.spec ++
#
# spec file for package ohcount
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An Open Source License is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: ohcount
%define lname libohcount
Version:3.0.0.g297
Release:0
# git-describe: 2.0.1-297-g6cb04fe
Url:http://ohloh.net/p/ohcount
Summary:The Ohloh source code line counter
License:GPL-2.0
Group: Development/Tools/Other
# http://sourceforge.net/projects/ohcount/files/ is no longer updated it seems.
#Git-Clone: git://github.com/blackducksw/ohcount
Source: %name-%version.tar.xz
Patch1: cflags.diff
Patch2: swig-ruby19.diff
Patch3: shared.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bash
BuildRequires: file-devel
BuildRequires: gcc = 4.1.2
BuildRequires: gperf
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: ragel = 6.3, ruby-devel
BuildRequires: swig
BuildRequires: xz
BuildRequires: pkgconfig(ruby-1.9)
%description
Ohcount supports over 70 popular programming languages, and has been
used to count over 6 billion lines of code by 300,000 developers.
Ohcount does more more than just count lines of code. It can also
detect popular open source licenses such as GPL within a large
directory of source code. It can also detect code that targets a
particular programming API, such as Win32 or KDE.
%package -n %lname
Summary:Ohcount source code analyzer library
Group: System/Libraries
%description -n %lname
The core parsing library for the Ohcount source code analyzer program
and for its ruby bindings.
%package ruby
Summary:Ruby bindings for the Ohcount source code analyzer
Group: Development/Languages/Ruby
%description ruby
Ruby bindings for the Ohcount source code analyzer.
%prep
%setup -qn %name
%patch -P 1 -P 2 -P 3 -p1
%build
export CFLAGS=%optflags $(pkg-config ruby-1.9 --cflags);
export SHARED=-Wl,-soname,libohcount.so;
./build ohcount;
./build ruby;
%install
b=%buildroot;
mkdir -p $b/%_bindir $b/%_libdir;
install -pm0755 bin/ohcount $b/%_bindir/;
install -pm0755 src/libohcount*.so $b/%_libdir/;
r=$b/%_libdir/ruby/vendor_ruby/$(pkg-config ruby-1.9 --modversion);
mkdir -p $r;
cp -a ruby $r/;
rm -f $r/*.{c,i};
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc COPYING
%_bindir/ohcount
%files -n libohcount
%defattr(-,root,root)
%_libdir/libohcount.so
%files ruby
%defattr(-,root,root)
%_libdir/ruby
%changelog
++ cflags.diff ++
From: Jan Engelhardt jeng...@inai.de
Date: 2012-11-16 01:01:33.597645291 +0100
Tweak the build script so that we can actually _pass_ some flags in.
---
build |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: ohcount/build
===
--- ohcount.orig/build
+++ ohcount/build
@@ -17,7 +17,7 @@ then
fi
# You shouldn't have to change the following.
- CFLAGS=-O3
+ CFLAGS=-O3 $CFLAGS
WARN=-Wall -Wno-pointer-to-int-cast -Wno-parentheses
SHARED=-shared
SHARED_NAME=libohcount.so
@@ -28,7 +28,7 @@ else
INC_DIR=/opt/local/include
LIB_DIR=/opt/local/lib
# You shouldn't have to change the following.
- CFLAGS=-fno-common -g
+ CFLAGS=-fno-common -g $CFLAGS
WARN=-Wall
