Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #55 from ertugerata/master

Browse Source 
nano and slang moved from system.base
This commit is contained in:
Ertuğrul Erata
2015-07-13 16:08:18 +03:00
parent 5318abe0cd ca881679af
commit 05b7355cc0
16 changed files with 100 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi-index.xml
+91 -155
View File
@@ -3246,6 +3246,88 @@
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>slang</Name>
<Homepage>http://www.jedsoft.org/slang/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<License>Artistic</License>
<IsA>app:console</IsA>
<PartOf>programming.library</PartOf>
<Summary xml:lang="en">Console display library used by most text viewer</Summary>
<Summary xml:lang="tr">Bir çok metin gösterici yazılım tarfından kullanılan konsol görüntüleme kütüphanesi</Summary>
<Description xml:lang="fr">S-Lang est une librarie de programmation multi-plateforme conçue pour permettre aux développeur de développer des logiciels robustes et portables. Elle fournit les mécanismes requis pour développer une application interactive telle que la gestion d&apos;affichages/écrans, entrées clavier, disposition de touches et ainsi de suite. La fonctionnalité la plus attractive de cette librairie reste l&apos;interpréteur slang qui peut être embarqué au sein même d&apos;un programme pour le rendre extensible.</Description>
<Description xml:lang="en">S-Lang is a multi-platform programmer&apos;s library designed to allow a developer to create robust multi-platform software. It provides facilities required by interactive applications such as display/screen management, keyboard input, keymaps, and so on. The most exciting feature of the library is the slang interpreter that may be easily embedded into a program to make it extensible.</Description>
<Description xml:lang="tr">S-lang, yazılım geliştiricilerin bütün işletim sistemlerinde çalışabilen güçlü uygulamalar geliştirmesine yardımcı olan bir uygulama kitaplığıdır. İnteraktif uygulamalar için ekran yönetimi ve klavye girişi gibi araçlar sunar. Kitaplığın en ilginç özelliği programların içine kolayca gömülebilen ve programı genişletilebilir kılan slang yorumlayıcısıdır.</Description>
<Archive type="tarbz2" sha1sum="34e68a993888d0ae2ebc7bc31b40bc894813a7e2">ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/slang-2.2.4.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libpng-devel</Dependency>
<Dependency>libpcre-devel</Dependency>
<Dependency>ncurses-devel</Dependency>
<Dependency>readline-devel</Dependency>
<Dependency>zlib-devel</Dependency>
</BuildDependencies>
<SourceURI>programming/library/slang/pspec.xml</SourceURI>
</Source>
<Package>
<Name>slang</Name>
<RuntimeDependencies>
<Dependency>libpng</Dependency>
<Dependency>libpcre</Dependency>
<Dependency>zlib</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/slsh</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc/slang</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package>
<Name>slang-devel</Name>
<Summary xml:lang="en">Development files for slang</Summary>
<Summary xml:lang="tr">slang için geliştirme dosyaları</Summary>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
<Dependency release="3">slang</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="doc">/usr/share/doc/slang/html</Path>
<Path fileType="man">/usr/share/man/man3</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2014-05-11</Date>
<Version>2.2.4</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-10-31</Date>
<Version>2.2.4</Version>
<Comment>rebuild.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-08-23</Date>
<Version>2.2.4</Version>
<Comment>First release</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>docbook-xml</Name>
@@ -4897,88 +4979,6 @@
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>slang</Name>
<Homepage>http://www.jedsoft.org/slang/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<License>Artistic</License>
<IsA>app:console</IsA>
<PartOf>system.base</PartOf>
<Summary xml:lang="en">Console display library used by most text viewer</Summary>
<Summary xml:lang="tr">Bir çok metin gösterici yazılım tarfından kullanılan konsol görüntüleme kütüphanesi</Summary>
<Description xml:lang="fr">S-Lang est une librarie de programmation multi-plateforme conçue pour permettre aux développeur de développer des logiciels robustes et portables. Elle fournit les mécanismes requis pour développer une application interactive telle que la gestion d&apos;affichages/écrans, entrées clavier, disposition de touches et ainsi de suite. La fonctionnalité la plus attractive de cette librairie reste l&apos;interpréteur slang qui peut être embarqué au sein même d&apos;un programme pour le rendre extensible.</Description>
<Description xml:lang="en">S-Lang is a multi-platform programmer&apos;s library designed to allow a developer to create robust multi-platform software. It provides facilities required by interactive applications such as display/screen management, keyboard input, keymaps, and so on. The most exciting feature of the library is the slang interpreter that may be easily embedded into a program to make it extensible.</Description>
<Description xml:lang="tr">S-lang, yazılım geliştiricilerin bütün işletim sistemlerinde çalışabilen güçlü uygulamalar geliştirmesine yardımcı olan bir uygulama kitaplığıdır. İnteraktif uygulamalar için ekran yönetimi ve klavye girişi gibi araçlar sunar. Kitaplığın en ilginç özelliği programların içine kolayca gömülebilen ve programı genişletilebilir kılan slang yorumlayıcısıdır.</Description>
<Archive type="tarbz2" sha1sum="34e68a993888d0ae2ebc7bc31b40bc894813a7e2">ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/slang-2.2.4.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libpng-devel</Dependency>
<Dependency>libpcre-devel</Dependency>
<Dependency>ncurses-devel</Dependency>
<Dependency>readline-devel</Dependency>
<Dependency>zlib-devel</Dependency>
</BuildDependencies>
<SourceURI>system/base/slang/pspec.xml</SourceURI>
</Source>
<Package>
<Name>slang</Name>
<RuntimeDependencies>
<Dependency>libpng</Dependency>
<Dependency>libpcre</Dependency>
<Dependency>zlib</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/slsh</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc/slang</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package>
<Name>slang-devel</Name>
<Summary xml:lang="en">Development files for slang</Summary>
<Summary xml:lang="tr">slang için geliştirme dosyaları</Summary>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
<Dependency release="3">slang</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="doc">/usr/share/doc/slang/html</Path>
<Path fileType="man">/usr/share/man/man3</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2014-05-11</Date>
<Version>2.2.4</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-10-31</Date>
<Version>2.2.4</Version>
<Comment>rebuild.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-08-23</Date>
<Version>2.2.4</Version>
<Comment>First release</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>libssh2</Name>
@@ -14063,7 +14063,7 @@
<Summary xml:lang="tr">Gelişmiş sistem günlükleme hizmeti</Summary>
<Description xml:lang="en">rsyslog is an enhanced multi-threaded syslogd supporting, among others, MySQL, syslog/tcp, RFC 3195, permitted sender lists, filtering on any message part, and fine grain output format control. It is quite compatible with stock sysklogd and can be used as a drop-in replacement.</Description>
<Description xml:lang="tr">rsyslog, çoklu iş parçacığı, MySQL, syslog/tcp, RFC 3195, izin verilen gönderici listesi, gelişmiş ileti filtreleme gibi özelliklere sahip gelişmiş bir sistem günlükleme hizmetidir.</Description>
<Archive type="targz" sha1sum="e8d767f0c3e0b7ed0e20bf3e2513d3c2d5c30239">http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.9.0.tar.gz</Archive>
<Archive type="targz" sha1sum="b78ae3d9db4e191d7a6dd9c4c7483c82abe039d7">http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.11.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>zlib-devel</Dependency>
<Dependency>json-c-devel</Dependency>
@@ -14091,6 +14091,7 @@
<Path fileType="config">/etc/conf.d</Path>
<Path fileType="config">/etc/rsyslog.d</Path>
<Path fileType="config">/etc/rsyslog.conf</Path>
<Path fileType="data">/var</Path>
</Files>
<Provides>
<COMAR script="service.py">System.Service</COMAR>
@@ -14103,6 +14104,13 @@
</AdditionalFiles>
</Package>
<History>
<Update release="8">
<Date>2015-07-13</Date>
<Version>8.11.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="7">
<Date>2015-05-05</Date>
<Version>8.9.0</Version>
@@ -16839,78 +16847,6 @@
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>nano</Name>
<Homepage>http://www.nano-editor.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv3</License>
<IsA>app:console</IsA>
<PartOf>system.base</PartOf>
<Summary xml:lang="en">GNU GPL&apos;d Pico clone with more functionality</Summary>
<Summary xml:lang="tr">Konsol ortamında kullanabileceğiniz bir metin düzenleyicidir.</Summary>
<Description xml:lang="fr">Nano est un petit éditeur libre et convivial qui a pour but de remplacer Pico, l&apos;éditeur par défaut inclus dans le paquet non-libre Pine. Plutôt que juste copier l&apos;apparence et le ressenti de Pico, nan implémente également certaines fonctionnalité manquantes (ou désactivées par défaut), tel que &quot;rechercher et remplacer&quot; ou &quot;allez à la ligne numéro&quot;.</Description>
<Description xml:lang="en">Nano is a small, free and friendly editor which aims to replace Pico, the default editor included in the non-free Pine package. Rather than just copying Pico&apos;s look and feel, nano also implements some missing (or disabled by default) features in Pico, such as &quot;search and replace&quot; and &quot;go to line number&quot;.</Description>
<Description xml:lang="tr">Nano özgür olmayan Pine paketinin içindeki metin düzenleme programı olan Pico&apos;nun yerine geçme hedefini güden küçük, özgür ve kullanışlı bir metin düzenleme programıdır. Pico&apos;nun görünüşünü ve işlevini kopyalamaktan çok, Nano aynı zamanda &quot;ara ve değiştir&quot; ve &quot;satır numarasına git&quot; gibi Pico&apos;da olmayan (veya ön tanımlı olarak kapalı) bazı özellikleri sunar.</Description>
<Archive type="targz" sha1sum="7ee64425238abb89b7db9721b9ee09ec262f6bb2">http://www.nano-editor.org/dist/v2.3/nano-2.3.5.tar.gz</Archive>
<BuildDependencies>
<Dependency>ncurses-devel</Dependency>
<Dependency>gettext-devel</Dependency>
<Dependency>slang</Dependency>
</BuildDependencies>
<SourceURI>system/base/nano/pspec.xml</SourceURI>
</Source>
<Package>
<Name>nano</Name>
<RuntimeDependencies>
<Dependency>ncurses</Dependency>
<Dependency>file</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="doc">/usr/share/doc/nano</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="info">/usr/share/info</Path>
<Path fileType="data">/usr/share/nano</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/bin</Path>
</Files>
</Package>
<History>
<Update release="4">
<Date>2014-07-11</Date>
<Version>2.3.5</Version>
<Comment>Version bump.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-05-11</Date>
<Version>2.3.1</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-07-26</Date>
<Version>2.3.1</Version>
<Comment>Fix dep, release bump.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2011-06-27</Date>
<Version>2.3.1</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>dbus</Name>
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
f4e4a417e226b52316c94b3a8551f37d2eed9728
b34c3701bea38b8406cb3322d2314a6bd35d6c5c
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
0381ffd1e2025385e853f8a9a7c77513c3e94c27
241c661b6c90e2fec802f7721e953fdab0042fb5
programming/component.xml
+3
View File
@@ -0,0 +1,3 @@
<PISI>
<Name>programming</Name>
</PISI>
programming/library/component.xml
+4
View File
@@ -0,0 +1,4 @@
<PISI>
<Name>programming.library</Name>
</PISI>
system/base/slang/actions.py → programming/library/slang/actions.py
View File
system/base/slang/pspec.xml → programming/library/slang/pspec.xml
View File
system/base/slang/translations.xml → programming/library/slang/translations.xml
View File
system/base/nano/actions.py
-25
View File
@@ -1,25 +0,0 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
autotools.autoreconf("-fvi")
autotools.configure("--disable-rpath \
--enable-utf8 \
--enable-altrcname \
--disable-speller")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.insinto("/etc/", "doc/nanorc.sample", "nanorc")
pisitools.dosym("/usr/bin/nano", "/bin/nano")
pisitools.dohtml("doc/*.html")
pisitools.dodoc("ChangeLog*", "README", "doc/nanorc.sample", "AUTHORS", "NEWS", "TODO", "COPYING*", "THANKS", "UPGRADE")
system/base/nano/files/0001-nanorc-default-settings-changes.patch
-173
View File
@@ -1,173 +0,0 @@
From ffb42bb0d87586adac14144b98333eb52808ce99 Mon Sep 17 00:00:00 2001
From: Mehmet Emre Atasever <memre@pardus.org.tr>
Date: Sun, 26 Jun 2011 18:39:04 +0300
Subject: [PATCH] nanorc default settings changes
Some default settings are not so convenient for Pisi Linux nano users.
also fixes bugs (#pb18483, #pb18484)
---
doc/nanorc.sample.in | 64 +++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index f164c26..24d3c7b 100644
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -25,17 +25,17 @@
# set backupdir ""
## Do backwards searches by default.
-# set backwards
+set backwards
## Use bold text instead of reverse video text.
-# set boldtext
+set boldtext
## The characters treated as closing brackets when justifying
## paragraphs. They cannot contain blank characters. Only closing
## punctuation, optionally followed by closing brackets, can end
## sentences.
##
-# set brackets ""')>]}"
+set brackets ""')>]}"
## Do case sensitive searches by default.
# set casesensitive
@@ -60,7 +60,7 @@
## searches. They cannot contain blank characters. The former set must
## come before the latter set, and both must be in the same order.
##
-# set matchbrackets "(<[{)>]}"
+set matchbrackets "(<[{)>]}"
## Use the blank line below the titlebar as extra editing space.
# set morespace
@@ -139,7 +139,7 @@
# set smarthome
## Use smooth scrolling as the default.
-# set smooth
+set smooth
## Enable soft line wrapping (AKA full line display).
# set softwrap
@@ -153,7 +153,7 @@
# set suspend
## Use this tab size instead of the default; it must be greater than 0.
-# set tabsize 8
+set tabsize 4
## Convert typed tabs to spaces.
# set tabstospaces
@@ -234,79 +234,79 @@
## Nanorc files
-# include "@PKGDATADIR@/nanorc.nanorc"
+include "@PKGDATADIR@/nanorc.nanorc"
## C/C++
-# include "@PKGDATADIR@/c.nanorc"
+include "@PKGDATADIR@/c.nanorc"
## Makefiles
-# include "@PKGDATADIR@/makefile.nanorc"
+include "@PKGDATADIR@/makefile.nanorc"
## Cascading Style Sheets
-# include "@PKGDATADIR@/css.nanorc"
+include "@PKGDATADIR@/css.nanorc"
## Debian files
-# include "@PKGDATADIR@/debian.nanorc"
+include "@PKGDATADIR@/debian.nanorc"
## Gentoo files
-# include "@PKGDATADIR@/gentoo.nanorc"
+include "@PKGDATADIR@/gentoo.nanorc"
## HTML
-# include "@PKGDATADIR@/html.nanorc"
+include "@PKGDATADIR@/html.nanorc"
## PHP
-# include "@PKGDATADIR@/php.nanorc"
+include "@PKGDATADIR@/php.nanorc"
## TCL
-# include "@PKGDATADIR@/tcl.nanorc"
+include "@PKGDATADIR@/tcl.nanorc"
## TeX
-# include "@PKGDATADIR@/tex.nanorc"
+include "@PKGDATADIR@/tex.nanorc"
## Quoted emails (under e.g. mutt)
-# include "@PKGDATADIR@/mutt.nanorc"
+include "@PKGDATADIR@/mutt.nanorc"
## Patch files
-# include "@PKGDATADIR@/patch.nanorc"
+include "@PKGDATADIR@/patch.nanorc"
## Manpages
-# include "@PKGDATADIR@/man.nanorc"
+include "@PKGDATADIR@/man.nanorc"
## Groff
-# include "@PKGDATADIR@/groff.nanorc"
+include "@PKGDATADIR@/groff.nanorc"
## Perl
-# include "@PKGDATADIR@/perl.nanorc"
+include "@PKGDATADIR@/perl.nanorc"
## Python
-# include "@PKGDATADIR@/python.nanorc"
+include "@PKGDATADIR@/python.nanorc"
## Ruby
-# include "@PKGDATADIR@/ruby.nanorc"
+include "@PKGDATADIR@/ruby.nanorc"
## Java
-# include "@PKGDATADIR@/java.nanorc"
+include "@PKGDATADIR@/java.nanorc"
## Fortran
-# include "@PKGDATADIR@/fortran.nanorc"
+include "@PKGDATADIR@/fortran.nanorc"
## Objective-C
-# include "@PKGDATADIR@/objc.nanorc"
+include "@PKGDATADIR@/objc.nanorc"
## OCaml
-# include "@PKGDATADIR@/ocaml.nanorc"
+include "@PKGDATADIR@/ocaml.nanorc"
## AWK
-# include "@PKGDATADIR@/awk.nanorc"
+include "@PKGDATADIR@/awk.nanorc"
## Assembler
-# include "@PKGDATADIR@/asm.nanorc"
+include "@PKGDATADIR@/asm.nanorc"
## Bourne shell scripts
-# include "@PKGDATADIR@/sh.nanorc"
+include "@PKGDATADIR@/sh.nanorc"
## POV-Ray
-# include "@PKGDATADIR@/pov.nanorc"
+include "@PKGDATADIR@/pov.nanorc"
## XML-type files
-# include "@PKGDATADIR@/xml.nanorc"
+include "@PKGDATADIR@/xml.nanorc"
--
1.7.5.4
system/base/nano/files/fedora/0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch
-77
View File
@@ -1,77 +0,0 @@
From fc87b0a32c130a2b3ab37e614d4a1c6c8e5d70e7 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 19 Aug 2010 13:58:12 +0200
Subject: [PATCH 1/2] check stat's result and avoid calling stat on a NULL pointer
---
src/files.c | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/files.c b/src/files.c
index f6efbf1..99cc1b8 100644
--- a/src/files.c
+++ b/src/files.c
@@ -103,6 +103,24 @@ void initialize_buffer_text(void)
openfile->totsize = 0;
}
+#ifndef NANO_TINY
+/* If *pstat is NULL, perform a stat call with the given file name. On success,
+ * *pstat points to a newly allocated buffer that contains the stat's result.
+ * On stat's failure, the NULL pointer in *pstat is left intact. */
+void stat_if_needed(const char *filename, struct stat **pstat)
+{
+ struct stat *tmp;
+ if (*pstat)
+ return;
+
+ tmp = (struct stat *)nmalloc(sizeof(struct stat));
+ if (0 == stat(filename, tmp))
+ *pstat = tmp;
+ else
+ free(tmp);
+}
+#endif
+
/* If it's not "", filename is a file to open. We make a new buffer, if
* necessary, and then open and read the file, if applicable. */
void open_buffer(const char *filename, bool undoable)
@@ -148,11 +166,7 @@ void open_buffer(const char *filename, bool undoable)
if (rc > 0) {
read_file(f, rc, filename, undoable, new_buffer);
#ifndef NANO_TINY
- if (openfile->current_stat == NULL) {
- openfile->current_stat =
- (struct stat *)nmalloc(sizeof(struct stat));
- stat(filename, openfile->current_stat);
- }
+ stat_if_needed(filename, &openfile->current_stat);
#endif
}
@@ -1532,8 +1546,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
* specified it interactively), stat and save the value
* or else we will chase null pointers when we do
* modtime checks, preserve file times, etc. during backup */
- if (openfile->current_stat == NULL && !tmp && realexists)
- stat(realname, openfile->current_stat);
+ if (!tmp && realexists)
+ stat_if_needed(realname, &openfile->current_stat);
/* We backup only if the backup toggle is set, the file isn't
* temporary, and the file already exists. Furthermore, if we
@@ -1924,7 +1938,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
if (openfile->current_stat == NULL)
openfile->current_stat =
(struct stat *)nmalloc(sizeof(struct stat));
- stat(realname, openfile->current_stat);
+ if (stat(realname, openfile->current_stat)) {
+ free(openfile->current_stat);
+ openfile->current_stat = NULL;
+ }
#endif
statusbar(P_("Wrote %lu line", "Wrote %lu lines",
--
1.7.4
system/base/nano/files/fedora/0002-use-futimens-if-available-instead-of-utime.patch
-128
View File
@@ -1,128 +0,0 @@
From 23510b930ea31f7de8005e2f0ff6cab7062b4e26 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 19 Aug 2010 15:23:06 +0200
Subject: [PATCH 2/2] use futimens() if available, instead of utime()
---
config.h.in | 3 +++
configure | 2 +-
configure.ac | 2 +-
src/files.c | 48 +++++++++++++++++++++++++++++++++++-------------
4 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/config.h.in b/config.h.in
index 52e13f1..cb17b29 100644
--- a/config.h.in
+++ b/config.h.in
@@ -64,6 +64,9 @@
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
+/* Define to 1 if you have the `futimens' function. */
+#undef HAVE_FUTIMENS
+
/* Define to 1 if you have the `getdelim' function. */
#undef HAVE_GETDELIM
diff --git a/configure b/configure
index 02733c7..1805e53 100755
--- a/configure
+++ b/configure
@@ -7484,7 +7484,7 @@ fi
-for ac_func in getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf
+for ac_func in futimens getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/configure.ac b/configure.ac
index 66f8ee3..f4975d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,7 +415,7 @@ fi])
dnl Checks for functions.
-AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf)
+AC_CHECK_FUNCS(futimens getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf)
if test x$enable_utf8 != xno; then
AC_CHECK_FUNCS(iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth)
diff --git a/src/files.c b/src/files.c
index 99cc1b8..9a1bdcc 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1455,6 +1455,29 @@ int copy_file(FILE *inn, FILE *out)
return retval;
}
+#ifdef HAVE_FUTIMENS
+/* set atime/mtime by file descriptor */
+int utime_wrap(int fd, const char *filename, struct utimbuf *ut)
+{
+ struct timespec times[2];
+ (void) filename;
+
+ times[0].tv_sec = ut->actime;
+ times[1].tv_sec = ut->modtime;
+ times[0].tv_nsec = 0L;
+ times[1].tv_nsec = 0L;
+
+ return futimens(fd, times);
+}
+#else
+/* set atime/mtime by file name */
+int utime_wrap(int fd, const char *filename, struct utimbuf *ut)
+{
+ (void) fd;
+ return utime(filename, ut);
+}
+#endif
+
/* Write a file out to disk. If f_open isn't NULL, we assume that it is
* a stream associated with the file, and we don't try to open it
* ourselves. If tmp is TRUE, we set the umask to disallow anyone else
@@ -1694,6 +1717,18 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
fprintf(stderr, "Backing up %s to %s\n", realname, backupname);
#endif
+ /* Set backup's file metadata. */
+ if (utime_wrap(backup_fd, backupname, &filetime) == -1
+ && !ISSET(INSECURE_BACKUP)) {
+ statusbar(_("Error writing backup file %s: %s"), backupname,
+ strerror(errno));
+ /* If we can't write to the backup, DONT go on, since
+ whatever caused the backup file to fail (e.g. disk
+ full may well cause the real file write to fail, which
+ means we could lose both the backup and the original! */
+ goto cleanup_and_exit;
+ }
+
/* Copy the file. */
copy_status = copy_file(f, backup_file);
@@ -1704,19 +1739,6 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
goto cleanup_and_exit;
}
- /* And set its metadata. */
- if (utime(backupname, &filetime) == -1 && !ISSET(INSECURE_BACKUP)) {
- if (prompt_failed_backupwrite(backupname))
- goto skip_backup;
- statusbar(_("Error writing backup file %s: %s"), backupname,
- strerror(errno));
- /* If we can't write to the backup, DONT go on, since
- whatever caused the backup file to fail (e.g. disk
- full may well cause the real file write to fail, which
- means we could lose both the backup and the original! */
- goto cleanup_and_exit;
- }
-
free(backupname);
}
--
1.7.4
system/base/nano/files/fedora/nano-2.3.0-warnings.patch
-42
View File
@@ -1,42 +0,0 @@
po/Makefile.in.in | 1 +
src/nano.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ada8bb4..f7b2a95 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -20,6 +20,7 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
datadir = @datadir@
localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po
diff --git a/src/nano.c b/src/nano.c
index 269ab29..5b605bf 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1925,7 +1925,7 @@ precalc_cleanup:
* TRUE. */
void do_output(char *output, size_t output_len, bool allow_cntrls)
{
- size_t current_len, orig_lenpt, i = 0;
+ size_t current_len, orig_lenpt = 0, i = 0;
char *char_buf = charalloc(mb_cur_max());
int char_buf_len;
diff --git a/src/search.c b/src/search.c
index ca93098..3451600 100644
--- a/src/search.c
+++ b/src/search.c
@@ -138,7 +138,7 @@ int search_init(bool replacing, bool use_answer)
int i = 0;
char *buf;
sc *s;
- void (*func)(void);
+ void (*func)(void) = (void (*)(void))0;
bool meta_key = FALSE, func_key = FALSE;
static char *backupstring = NULL;
/* The search string we'll be using. */
system/base/nano/pspec.xml
-77
View File
@@ -1,77 +0,0 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>nano</Name>
<Homepage>http://www.nano-editor.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv3</License>
<IsA>app:console</IsA>
<Summary>GNU GPL'd Pico clone with more functionality</Summary>
<Description>Nano is a small, free and friendly editor which aims to replace Pico, the default editor included in the non-free Pine package. Rather than just copying Pico's look and feel, nano also implements some missing (or disabled by default) features in Pico, such as "search and replace" and "go to line number".</Description>
<Archive sha1sum="7ee64425238abb89b7db9721b9ee09ec262f6bb2" type="targz">http://www.nano-editor.org/dist/v2.3/nano-2.3.5.tar.gz</Archive>
<BuildDependencies>
<Dependency>ncurses-devel</Dependency>
<Dependency>gettext-devel</Dependency>
<Dependency>slang</Dependency>
</BuildDependencies>
<Patches>
<!--<Patch level="1">fedora/nano-2.3.0-warnings.patch</Patch>
<Patch level="1">fedora/0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch</Patch>
<Patch level="1">fedora/0002-use-futimens-if-available-instead-of-utime.patch</Patch>
<Patch level="1">0001-nanorc-default-settings-changes.patch</Patch>-->
</Patches>
</Source>
<Package>
<Name>nano</Name>
<RuntimeDependencies>
<Dependency>ncurses</Dependency>
<Dependency>file</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="doc">/usr/share/doc/nano</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="info">/usr/share/info</Path>
<Path fileType="data">/usr/share/nano</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/bin</Path>
</Files>
</Package>
<History>
<Update release="4">
<Date>2014-07-11</Date>
<Version>2.3.5</Version>
<Comment>Version bump.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-05-11</Date>
<Version>2.3.1</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-07-26</Date>
<Version>2.3.1</Version>
<Comment>Fix dep, release bump.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2011-06-27</Date>
<Version>2.3.1</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
system/base/nano/translations.xml
-9
View File
@@ -1,9 +0,0 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>nano</Name>
<Summary xml:lang="tr">Konsol ortamında kullanabileceğiniz bir metin düzenleyicidir.</Summary>
<Description xml:lang="tr">Nano özgür olmayan Pine paketinin içindeki metin düzenleme programı olan Pico'nun yerine geçme hedefini güden küçük, özgür ve kullanışlı bir metin düzenleme programıdır. Pico'nun görünüşünü ve işlevini kopyalamaktan çok, Nano aynı zamanda &quot;ara ve değiştir&quot; ve &quot;satır numarasına git&quot; gibi Pico'da olmayan (veya ön tanımlı olarak kapalı) bazı özellikleri sunar.</Description>
<Description xml:lang="fr">Nano est un petit éditeur libre et convivial qui a pour but de remplacer Pico, l'éditeur par défaut inclus dans le paquet non-libre Pine. Plutôt que juste copier l'apparence et le ressenti de Pico, nan implémente également certaines fonctionnalité manquantes (ou désactivées par défaut), tel que &quot;rechercher et remplacer&quot; ou &quot;allez à la ligne numéro&quot;.</Description>
</Source>
</PISI>