From c66d6abece7dafe247281996e467e845560842b8 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mar 22 2011 22:16:29 +0000 Subject: Update to 031 --- diff --git a/.gitignore b/.gitignore index 85f39be..2d00fdb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/bti-030.tar.bz2 +/bti-031.tar.bz2 diff --git a/bti-028-readline5.patch b/bti-028-readline5.patch deleted file mode 100644 index 64bdcd3..0000000 --- a/bti-028-readline5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bti-028/Makefile.in.readline5 2010-09-02 03:30:20.000000000 +0200 -+++ bti-028/Makefile.in 2010-09-08 15:08:26.525670075 +0200 -@@ -152,7 +152,7 @@ - LIBOBJS = @LIBOBJS@ - LIBPCRE_CFLAGS = @LIBPCRE_CFLAGS@ - LIBPCRE_LIBS = @LIBPCRE_LIBS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -ldl -lreadline - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ - MKDIR_P = @MKDIR_P@ diff --git a/bti-030-comment_marker.patch b/bti-030-comment_marker.patch deleted file mode 100644 index 0a7d413..0000000 --- a/bti-030-comment_marker.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/config.c b/config.c -index 346fed8..674964b 100644 ---- a/config.c -+++ b/config.c -@@ -327,6 +327,7 @@ void bti_parse_configfile(struct session *session) - char *line = NULL; - char *key = NULL; - char *value = NULL; -+ char *hashmarker; - size_t len = 0; - ssize_t n; - char *c; -@@ -344,8 +345,28 @@ void bti_parse_configfile(struct session *session) - if (line[n - 1] == '\n') - line[n - 1] = '\0'; - -- /* '#' is comment markers, like bash style */ -- *strchrnul(line, '#') = '\0'; -+ /* -+ * '#' is comment markers, like bash style but it is a valid -+ * character in some fields, so only treat it as a comment -+ * marker if it occurs at the beginning of the line, or after -+ * whitespace -+ */ -+ hashmarker = strchrnul(line, '#'); -+ if (line == hashmarker) -+ line[0] = '\0'; -+ else { -+ while (hashmarker[0] != '\0') { -+ --hashmarker; -+ if (isblank(hashmarker[0])) -+ hashmarker[0] = '\0'; -+ else { -+ /* false positive; '#' occured -+ * within a string -+ */ -+ hashmarker = strchrnul(hashmarker+2, '#'); -+ } -+ } -+ } - c = line; - while (isspace(*c)) - c++; diff --git a/bti.spec b/bti.spec index 96f6f07..e12d1e2 100644 --- a/bti.spec +++ b/bti.spec @@ -1,6 +1,6 @@ Name: bti -Version: 030 -Release: 3%{?dist} +Version: 031 +Release: 1%{?dist} Summary: Bash Twitter/Identi.ca Idiocy Group: Applications/Internet @@ -8,16 +8,12 @@ License: GPLv2 URL: http://www.kernel.org/pub/linux/kernel/people/gregkh/bti Source0: http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{version}.tar.bz2 Source1: README.Fedora -Patch0: bti-028-readline5.patch -Patch1: bti-030-comment_marker.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?el5} -BuildRequires: curl-devel readline-devel -# This can be dropped once liboauth rev 2.1 lands -BuildRequires: nss-devel +BuildRequires: curl-devel %else -BuildRequires: libcurl-devel compat-readline5-devel +BuildRequires: libcurl-devel %endif BuildRequires: liboauth-devel libxml2-devel pcre-devel #Requires: @@ -29,11 +25,6 @@ and fast manner to annoy the whole world. %prep %setup -q -%if 0%{?el5} -%else -%patch0 -p1 -b .readline5 -%endif -%patch1 -p1 -b .comment_marker cp -p %{SOURCE1} . @@ -68,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 22 2011 Michel Salim - 031-1 +- Update to 031 + * Sat Mar 19 2011 Michel Salim - 030-3 - Improved comment marker fix, now safer and handle lines containing both non-marker and marker '#'s @@ -76,10 +70,10 @@ rm -rf $RPM_BUILD_ROOT - Improve detection of comment marker in configuration file * Fri Mar 18 2011 Michel Salim - 030-1 -- Update to 0.30 +- Update to 030 * Sat Mar 12 2011 Michel Salim - 029-1 -- Update to 0.29 +- Update to 029 * Mon Feb 07 2011 Fedora Release Engineering - 028-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index ca5f0ba..34c8ae5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29618ebbd6c16cc3997567a33286ac53 bti-030.tar.bz2 +030b2a74f976d89c1d9acbde5d72573f bti-031.tar.bz2