rpms/less
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Use POSIX regcomp instead of PCRE - revert 406-11

Browse Source 
Resolves: #643233

Revert "- configure a regular expression library"
This reverts commit 4b961c758d.

Conflicts:
	less.spec
This commit is contained in:
Vojtech Vitek (V-Teq) 2012-05-14 17:19:15 +02:00
parent eb6a16550a
commit 46c01743d8
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
less-394-search.patch Normal file
View File

@ -0,0 +1,32 @@
--- less-394/line.c.search 2005-12-03 21:20:32.000000000 +0100
+++ less-394/line.c 2006-02-15 11:23:25.308694376 +0100
@@ -1125,6 +1125,14 @@
break;
}
}
+ if (c == '\0')
+ {
+ /*
+ * Pretend the line ended here
+ */
+ new_pos = ch_tell();
+ break;
+ }
linebuf[n++] = c;
c = ch_forw_get();
}
@@ -1198,6 +1206,14 @@
*to = *fm;
n = size_linebuf - old_size_linebuf;
}
+ if (c == '\0')
+ {
+ /*
+ * Pretend the line ended here
+ */
+ new_pos = ch_tell() + 1;
+ break;
+ }
linebuf[--n] = c;
}
if (linep != NULL)

6
less.spec
View File

@ -9,6 +9,7 @@ Source1: lesspipe.sh
Source2: less.sh Source2: less.sh
Source3: less.csh Source3: less.csh
Patch1: less-443-Foption.patch Patch1: less-443-Foption.patch
Patch2: less-394-search.patch
Patch4: less-394-time.patch Patch4: less-394-time.patch
Patch5: less-418-fsync.patch Patch5: less-418-fsync.patch
Patch6: less-436-manpage-add-old-bot-option.patch Patch6: less-436-manpage-add-old-bot-option.patch
@ -17,7 +18,6 @@ Patch9: less-436-empty-lessopen-pipe.patch
URL: http://www.greenwoodsoftware.com/less/ URL: http://www.greenwoodsoftware.com/less/
Requires: groff Requires: groff
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: pcre-devel
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
%description %description
@ -33,6 +33,7 @@ files, and you'll use it frequently.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .Foption %patch1 -p1 -b .Foption
%patch2 -p1 -b .search
%patch4 -p1 -b .time %patch4 -p1 -b .time
%patch5 -p1 -b .fsync %patch5 -p1 -b .fsync
%patch6 -p1 -b .manpage-add-old-bot-option %patch6 -p1 -b .manpage-add-old-bot-option
@ -45,7 +46,7 @@ chmod -R a+w *
chmod 644 *.c *.h LICENSE README chmod 644 *.c *.h LICENSE README
%build %build
%configure --with-regex=pcre %configure
make CC="gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" datadir=%{_docdir} make CC="gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" datadir=%{_docdir}
%install %install
@ -70,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon May 14 2012 Vojtech Vitek (V-Teq) <vvitek@redhat.com> - 444-7 * Mon May 14 2012 Vojtech Vitek (V-Teq) <vvitek@redhat.com> - 444-7
- Fix less.sh not to override user-defined LESSOPEN variable (#802757) - Fix less.sh not to override user-defined LESSOPEN variable (#802757)
- Use POSIX regcomp instead of PCRE - revert 406-11, commit 4b961c7 (#643233)
* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 444-6 * Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 444-6
- Rebuild against PCRE 8.30 - Rebuild against PCRE 8.30