Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5580/dists/10.4/stable/main/finkinfo/editors
Modified Files:
nano-cur.patch nano-cur.info
Log Message:
Sync with svn version
sync versions
Index: nano-cur.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/nano-cur.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nano-cur.info 16 Oct 2011 09:25:58 -0000 1.1
+++ nano-cur.info 9 Jun 2013 11:39:33 -0000 1.2
@@ -1,6 +1,6 @@
Package: nano-cur
-Version: 2.3.1
-Revision: 4546
+Version: 2.3.2+svn4575
+Revision: 1
Description: Free Pico clone with some new features (dev)
License: GPL
Maintainer: Andreas Gockel <fink-n...@unixforge.de>
@@ -9,22 +9,19 @@
<<
BuildDepends: <<
libgettext8-dev, libiconv-dev, libncursesw5 (>= 5.4-20041023-1001),
- fink (>= 0.24.12), gettext-tools, automake1.11
+ fink (>= 0.24.12), gettext-tools, automake1.11, autoconf2.6
<<
Replaces: nano-unstable, nano-small, nano-noutf8, nano
Conflicts: nano-unstable, nano-small, nano-noutf8, nano
-Source: http://www.nano-editor.org/dist/v2.3/nano-%v.tar.gz
-Source-MD5: af09f8828744b0ea0808d6c19a2b4bfd
-#PatchFile: %n.patch
-#PatchFile-MD5: 0f5a4d49c9530d18332a5b769b093aaf
-#PatchScript: patch -p2 <%{PatchFile}
-SetCPPFLAGS: -I%p/include/ncursesw
-ConfigureParams: --disable-dependency-tracking --enable-utf8
-###
-# Debugging:
-#SetCFLAGS: -Wall -Wextra -std=gnu99 -pedantic
-#ConfigureParams: --enable-dependency-tracking --enable-utf8 --enable-debug
-###
+Source: http://www.nano-editor.org/dist/v2.3/nano-2.3.2.tar.gz
+Source-MD5: 6451aeae836471cadea8567c44a46c99
+PatchFile: %n.patch
+PatchFile-MD5: 905ac98122f474a71b2cf40502f5a157
+SetCFLAGS: -g -O2 -fstack-protector -Wformat -Werror=format-security -fPIE
+SetCPPFLAGS: -D_FORTIFY_SOURCE=2 -I%p/include/ncursesw
+SetCXXFLAGS: -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
-Werror=format-security -fPIE
+SetLDFLAGS: -Wl,-read_only_stubs -Wl,-bind_at_load -fPIE -Wl,-pie
+ConfigureParams: --disable-dependency-tracking --disable-wrapping-as-root
--enable-utf8
InstallScript: <<
/usr/bin/make install prefix=%i
/usr/bin/install -d -m 755 %i/{etc,share/doc/%n/man-html/fr}
@@ -58,11 +55,11 @@
<<
DescPort: <<
This version of nano includes all changes from svn since 2.2.6 release.
- Current svn version is: r4546
+ Current svn version is: r4575
.
Create patchfile:
cd into svn checkout
- diff --unidirectional-new-file -U 0 -rx .svn tags/nano_2_3_1 trunk/nano
+ diff --unidirectional-new-file -U 0 -rx .svn tags/nano_2_3_2 trunk/nano
remove rcsid from patchfile
<<
InfoTest: <<
Index: nano-cur.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/nano-cur.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nano-cur.patch 16 Oct 2011 09:25:58 -0000 1.1
+++ nano-cur.patch 9 Jun 2013 11:39:33 -0000 1.2
@@ -0,0 +1,52 @@
+diff --unidirectional-new-file -U 0 -rx .svn nano_2_3_2/ChangeLog
trunk/nano/ChangeLog
+--- nano_2_3_2/ChangeLog 2013-06-09 13:15:58.000000000 +0200
++++ trunk/nano/ChangeLog 2013-06-09 13:14:53.000000000 +0200
+@@ -0,0 +1,12 @@
++2013-04-12 Chris Allegretta <chr...@asty.org>
++ * src/files.c (do_insertfile): Check for saved cursor position when
inserting a
++ file as well. Fixes Savannah bug 38600 reported by Craig Barnes.
++ * src/files.c (write_file): Don't re-stat() the file if we're writing
out
++ a marked file (especially that would give it the wrong stat info).
Part
++ 2 of issue reported by Benno Schulenberg.
++
++2013-04-07 Michael Berg <m...@berg-net.us>
++ * do_cut_text - Fix copying (not cutting) text setting Modified state.
Fixes
++ issue reported by Benno Schulenberg.
++
++GNU nano 2.3.2 - 2011.03.23
+diff --unidirectional-new-file -U 0 -rx .svn nano_2_3_2/configure.ac
trunk/nano/configure.ac
+--- nano_2_3_2/configure.ac 2013-06-09 13:15:58.000000000 +0200
++++ trunk/nano/configure.ac 2013-06-09 13:14:53.000000000 +0200
+@@ -23 +23 @@
+-AC_INIT([GNU nano], [2.3.2], [nano-de...@gnu.org], [nano])
++AC_INIT([GNU nano], [2.3.2-svn], [nano-de...@gnu.org], [nano])
+diff --unidirectional-new-file -U 0 -rx .svn nano_2_3_2/src/cut.c
trunk/nano/src/cut.c
+--- nano_2_3_2/src/cut.c 2013-06-09 13:15:57.000000000 +0200
++++ trunk/nano/src/cut.c 2013-06-09 13:14:51.000000000 +0200
+@@ -212 +212,3 @@
+- set_modified();
++ if (!copy_text) {
++ set_modified();
++ }
+diff --unidirectional-new-file -U 0 -rx .svn nano_2_3_2/src/files.c
trunk/nano/src/files.c
+--- nano_2_3_2/src/files.c 2013-06-09 13:15:57.000000000 +0200
++++ trunk/nano/src/files.c 2013-06-09 13:14:51.000000000 +0200
+@@ -1198 +1198 @@
+- if (ISSET(MULTIBUFFER))
++ if (ISSET(MULTIBUFFER)) {
+@@ -1200,0 +1201,2 @@
++ ssize_t savedposline, savedposcol;
++
+@@ -1202 +1204,4 @@
+- else
++ if (!execute && ISSET(POS_HISTORY)
++ && check_poshistory(answer, &savedposline,
&savedposcol))
++ do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE,
FALSE, FALSE);
++ } else
+@@ -2137 +2142,2 @@
+- stat(realname, openfile->current_stat);
++ if (!openfile->mark_set)
++ stat(realname, openfile->current_stat);
+@@ -3198 +3204 @@
+- UNSET(HISTORYLOG);
++ UNSET(POS_HISTORY);
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
