Compare commits
32 Commits
bf3d066093
...
f026f3ae43
Author | SHA1 | Date |
---|---|---|
Jonas 'Sortie' Termansen | f026f3ae43 | |
Jonas 'Sortie' Termansen | 6ba8da83c3 | |
Jonas 'Sortie' Termansen | 96a8bae02d | |
Jonas 'Sortie' Termansen | cc791a45d2 | |
Jonas 'Sortie' Termansen | 8a89ca543c | |
Jonas 'Sortie' Termansen | deff2b660e | |
Jonas 'Sortie' Termansen | ed4d8d4840 | |
Jonas 'Sortie' Termansen | 9345e7e625 | |
Jonas 'Sortie' Termansen | 23872323e9 | |
Jonas 'Sortie' Termansen | 3722f22beb | |
Jonas 'Sortie' Termansen | bebe8c2b00 | |
Jonas 'Sortie' Termansen | 49d7aa16ad | |
Jonas 'Sortie' Termansen | 9d0fba9377 | |
Jonas 'Sortie' Termansen | 4a3b4b4495 | |
Jonas 'Sortie' Termansen | 578ffb9624 | |
Jonas 'Sortie' Termansen | 80f3883f4d | |
Jonas 'Sortie' Termansen | 113099a273 | |
Jonas 'Sortie' Termansen | a6778c8f04 | |
Jonas 'Sortie' Termansen | 696f264078 | |
Jonas 'Sortie' Termansen | a748ab4079 | |
Jonas 'Sortie' Termansen | 15992bc42d | |
Jonas 'Sortie' Termansen | be1cde7f0c | |
Jonas 'Sortie' Termansen | e40292c13b | |
Jonas 'Sortie' Termansen | 483c401fa5 | |
Jonas 'Sortie' Termansen | 8a34189750 | |
Jonas 'Sortie' Termansen | 5e8bcb23e2 | |
Jonas 'Sortie' Termansen | b992d6f6ab | |
Jonas 'Sortie' Termansen | 58a9b51e40 | |
Jonas 'Sortie' Termansen | e65b8e6e67 | |
Jonas 'Sortie' Termansen | 6b5e225a13 | |
Jonas 'Sortie' Termansen | febaec3d81 | |
Juhani Krekelä | 7d1087ed83 |
|
@ -1,3 +1,4 @@
|
|||
|
||||
set_minimal="cut dash e2fsprogs grep grub libssl mdocml sed signify tar wget xargs xz"
|
||||
set_basic="$set_minimal binutils bison bzip2 diffutils ed flex gawk gcc git gzip irssi libcurl libcurses libstdc++ m4 make nano ntpd patch perl pkg-config python ssh texinfo vim xorriso"
|
||||
set_basic="$set_minimal binutils bison bzip2 diffutils ed flex gawk gcc git gzip libcurl libcurses libstdc++ m4 make nano ntpd patch perl pkg-config python ssh texinfo vim xorriso"
|
||||
sets="basic minimal"
|
||||
|
|
|
@ -1,50 +1,16 @@
|
|||
diff -Paur --no-dereference -- irssi.upstream/Makefile.in irssi/Makefile.in
|
||||
--- irssi.upstream/Makefile.in
|
||||
+++ irssi/Makefile.in
|
||||
@@ -426,7 +426,7 @@
|
||||
BUILT_SOURCES = default-config.h default-theme.h irssi-version.h
|
||||
CLEANFILES = default-config.h default-theme.h
|
||||
SUBDIRS = src tests docs scripts themes utils
|
||||
-confdir = $(sysconfdir)
|
||||
+confdir = $(sysconfdir)/examples
|
||||
conf_DATA = irssi.conf
|
||||
pkgconfig_DATA = irssi-1.pc
|
||||
pkginclude_HEADERS = irssi-config.h irssi-version.h
|
||||
diff -Paur --no-dereference -- irssi.upstream/configure irssi/configure
|
||||
--- irssi.upstream/configure
|
||||
+++ irssi/configure
|
||||
@@ -18236,4 +18236,3 @@
|
||||
@@ -941,7 +941,8 @@
|
||||
|
||||
echo
|
||||
echo "If there are any problems, read the INSTALL file."
|
||||
-
|
||||
diff -Paur --no-dereference -- irssi.upstream/irssi.conf irssi/irssi.conf
|
||||
--- irssi.upstream/irssi.conf
|
||||
+++ irssi/irssi.conf
|
||||
@@ -1,4 +1,5 @@
|
||||
servers = (
|
||||
+ { address = "irc.sortix.org"; chatnet = "sortix"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
|
||||
{ address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
|
||||
{ address = "ssl.efnet.org"; chatnet = "EFNet"; port = "9999"; use_tls = "yes"; tls_verify = "no"; },
|
||||
{ address = "irc.esper.net"; chatnet = "EsperNet"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
|
||||
@@ -16,6 +17,9 @@
|
||||
);
|
||||
info-am:
|
||||
|
||||
chatnets = {
|
||||
+ sortix = {
|
||||
+ type = "IRC";
|
||||
+ };
|
||||
DALnet = {
|
||||
type = "IRC";
|
||||
max_kicks = "4";
|
||||
@@ -94,6 +98,7 @@
|
||||
};
|
||||
-install-data-am: install-confDATA install-pkgconfigDATA \
|
||||
+# PATCH: Don't install /etc/irssi.conf. Same configuration is built-in.
|
||||
+install-data-am: install-pkgconfigDATA \
|
||||
install-pkgincludeHEADERS
|
||||
|
||||
channels = (
|
||||
+ { name = "#sortix"; chatnet = "sortix"; autojoin = "No"; },
|
||||
{ name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; },
|
||||
{ name = "#libera"; chatnet = "liberachat";autojoin = "No"; },
|
||||
{ name = "#irssi"; chatnet = "liberachat";autojoin = "No"; },
|
||||
install-dvi: install-dvi-recursive
|
||||
diff -Paur --no-dereference -- irssi.upstream/src/core/log.c irssi/src/core/log.c
|
||||
--- irssi.upstream/src/core/log.c
|
||||
+++ irssi/src/core/log.c
|
||||
|
@ -115,27 +81,18 @@ diff -Paur --no-dereference -- irssi.upstream/src/core/net-disconnect.c irssi/sr
|
|||
diff -Paur --no-dereference -- irssi.upstream/src/core/network.c irssi/src/core/network.c
|
||||
--- irssi.upstream/src/core/network.c
|
||||
+++ irssi/src/core/network.c
|
||||
@@ -491,8 +491,6 @@
|
||||
|
||||
int net_host2ip(const char *host, IPADDR *ip)
|
||||
{
|
||||
- unsigned long addr;
|
||||
-
|
||||
if (strchr(host, ':') != NULL) {
|
||||
/* IPv6 */
|
||||
ip->family = AF_INET6;
|
||||
@@ -501,16 +499,8 @@
|
||||
@@ -501,16 +501,8 @@
|
||||
} else {
|
||||
/* IPv4 */
|
||||
ip->family = AF_INET;
|
||||
-#ifdef HAVE_INET_ATON
|
||||
- if (inet_aton(host, &ip->ip.s_addr) == 0)
|
||||
- return -1;
|
||||
+ if (inet_pton(AF_INET, host, &ip->ip) == 0)
|
||||
return -1;
|
||||
-#else
|
||||
- addr = inet_addr(host);
|
||||
- if (addr == INADDR_NONE)
|
||||
+ if (inet_pton(AF_INET, host, &ip->ip) == 0)
|
||||
return -1;
|
||||
- return -1;
|
||||
-
|
||||
- memcpy(&ip->ip, &addr, 4);
|
||||
-#endif
|
||||
|
|
|
@ -9,7 +9,5 @@ UPSTREAM_SITE=https://codeberg.org/irssi/irssi/releases/download/$VERSION
|
|||
UPSTREAM_ARCHIVE=$ARCHIVE
|
||||
RELEASE_SEARCH_PAGE=https://codeberg.org/irssi/irssi/releases
|
||||
BUILD_SYSTEM=configure
|
||||
# Perl support in irssi is fundamentally broken for cross-compilation.
|
||||
CONFIGURE_ARGS='--enable-true-color --with-perl=no'
|
||||
MAKE_VARS=V=1
|
||||
LICENSE=GPL-2.0-or-later
|
||||
|
|
Loading…
Reference in New Issue