Compare commits
2
Commits
debugcc
...
mms_purple
| Author | SHA1 | Date | |
|---|---|---|---|
 Clayton Craft
|
44742c8da0 | ||
|
Clayton Craft
|
80a7aa7606 |
No files matched your search
@@ -0,0 +1,85 @@
|
||||
From 331c9d2432dedef7994fdf0578b2cc022d43145c Mon Sep 17 00:00:00 2001
|
||||
From: clayton craft <clayton@craftyguy.net>
|
||||
Date: Mon, 28 Dec 2020 20:14:50 +0000
|
||||
Subject: [PATCH] libresolv
|
||||
|
||||
musl doesn't implement these functions
|
||||
---
|
||||
gweb/gresolv.c | 35 +++++++++++++----------------------
|
||||
1 file changed, 13 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/gweb/gresolv.c b/gweb/gresolv.c
|
||||
index bb1c32d..05051ce 100644
|
||||
--- a/gweb/gresolv.c
|
||||
+++ b/gweb/gresolv.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
+#include <stdio.h>
|
||||
#include <resolv.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
@@ -899,8 +900,6 @@ GResolv *g_resolv_new(int index)
|
||||
resolv->index = index;
|
||||
resolv->nameserver_list = NULL;
|
||||
|
||||
- res_ninit(&resolv->res);
|
||||
-
|
||||
return resolv;
|
||||
}
|
||||
|
||||
@@ -932,8 +931,6 @@ void g_resolv_unref(GResolv *resolv)
|
||||
|
||||
flush_nameservers(resolv);
|
||||
|
||||
- res_nclose(&resolv->res);
|
||||
-
|
||||
g_free(resolv);
|
||||
}
|
||||
|
||||
@@ -1032,29 +1029,23 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
|
||||
return 0;
|
||||
|
||||
if (resolv->nameserver_list == NULL) {
|
||||
- int i;
|
||||
printf("g_resolv_lookup_hostname: nameserver_list NULL\n");
|
||||
|
||||
printf("g_resolv_lookup_hostname: nscount=%d\n", resolv->res.nscount);
|
||||
-
|
||||
- for (i = 0; i < resolv->res.nscount; i++) {
|
||||
- char buf[100];
|
||||
- int family = resolv->res.nsaddr_list[i].sin_family;
|
||||
- void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr;
|
||||
-
|
||||
- if (family != AF_INET &&
|
||||
- resolv->res._u._ext.nsaddrs[i]) {
|
||||
- family = AF_INET6;
|
||||
- sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr;
|
||||
- }
|
||||
-
|
||||
- if (family != AF_INET && family != AF_INET6) {
|
||||
- printf("g_resolv_lookup_hostname: skipping b/c family=%d\n", family);
|
||||
- continue;
|
||||
+ FILE *f = fopen("/etc/resolv.conf", "r");
|
||||
+ if (f) {
|
||||
+ char line[256], *s;
|
||||
+ int i;
|
||||
+ while (fgets(line, sizeof(line), f)) {
|
||||
+ if (strncmp(line, "nameserver", 10) || !isspace(line[10]))
|
||||
+ continue;
|
||||
+ for (s = &line[11]; isspace(s[0]); s++);
|
||||
+ for (i = 0; s[i] && !isspace(s[i]); i++);
|
||||
+ s[i] = 0;
|
||||
+ g_resolv_add_nameserver(resolv, s, 53, 0);
|
||||
}
|
||||
+ fclose(f);
|
||||
|
||||
- if (inet_ntop(family, sa_addr, buf, sizeof(buf)))
|
||||
- g_resolv_add_nameserver(resolv, buf, 53, 0);
|
||||
}
|
||||
|
||||
if (resolv->nameserver_list == NULL) {
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
# Contributor: Clayton Craft <clayton@craftyguy.net>
|
||||
# Maintainer: Clayton Craft <clayton@craftyguy.net>
|
||||
pkgname=mmsd
|
||||
pkgver=0_git20210112
|
||||
pkgrel=0
|
||||
pkgdesc="Multimedia messaging service (MMS) daemon"
|
||||
url="https://source.puri.sm/fuzzy7k/mmsd"
|
||||
arch="all"
|
||||
license="GPL-2.0-only"
|
||||
makedepends="
|
||||
autoconf
|
||||
automake
|
||||
dbus-dev
|
||||
glib-dev
|
||||
libtool
|
||||
modemmanager-dev
|
||||
"
|
||||
# 'modemmanager' branch
|
||||
_commit=7633d3d1ec04071faa9a4bb4d1e61a9ef2e3b42d
|
||||
source="
|
||||
$pkgname-$pkgver.tar.gz::https://source.puri.sm/kop316/mmsd/-/archive/$_commit/mmsd-$_commit.tar.gz
|
||||
mmsd.desktop
|
||||
0001-libresolv.patch
|
||||
"
|
||||
builddir="$srcdir/$pkgname-$_commit"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
./bootstrap
|
||||
./configure --enable-maintainer-mode \
|
||||
--enable-debug \
|
||||
--prefix=$pkgdir/usr
|
||||
}
|
||||
|
||||
build() {
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
make install
|
||||
install -Dm644 "$srcdir"/mmsd.desktop "$pkgdir"/etc/xdg/autostart/mmsd.desktop
|
||||
|
||||
}
|
||||
|
||||
sha512sums="eed97ab491c118609673ab79620475d6fa48b1b1707054d6db49dc2c9dfe2c2313911ad499573396c564fbaa8c53a48b30a6959b732a20b94d7baaea7a03b467 mmsd-0_git20210112.tar.gz
|
||||
6a9dbe8aa2115b8c691929df217020be030c0e90fb98317635c8af0a2cdfb5a4f915e79b89836a70691769a327492042168856e9680525da0687a08dc8fc36fd mmsd.desktop
|
||||
2b7dee82877a52f5d28b639e6fc3fdce30b8b9d8f3b882a146bc0f3481673affec30e706c0310e54731894db63e5a498231d776b2d3015e6c04c410f49a7e127 0001-libresolv.patch"
|
||||
@@ -0,0 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Name=mmsd
|
||||
Comment=Daemon for MMS
|
||||
Exec=/usr/libexec/mmsd -d -n
|
||||
Terminal=false
|
||||
Type=Application
|
||||
X-GNOME-AutoRestart=true
|
||||
@@ -0,0 +1,31 @@
|
||||
# forked from Alpine Linux
|
||||
pkgname=purple-mm-sms
|
||||
pkgver=0.1.7_git20210112
|
||||
pkgrel=0
|
||||
pkgdesc="A libpurple plugin for sending and receiving SMS via Modemmanager"
|
||||
arch="all !s390x !mips64"
|
||||
url="https://source.puri.sm/Librem5/purple-mm-sms"
|
||||
license="GPL-2.0-or-later"
|
||||
depends="modemmanager"
|
||||
makedepends="
|
||||
evolution-data-server-dev
|
||||
glib-dev
|
||||
modemmanager-dev
|
||||
pidgin-dev
|
||||
"
|
||||
# 'mmsd' branch
|
||||
_commit=94d74f0b26fe953bc5f8be0fc7835876c94c6ae8
|
||||
source="https://source.puri.sm/kop316/purple-mm-sms/-/archive/$_commit/purple-mm-sms-$_commit.tar.gz"
|
||||
#source="https://source.puri.sm/Librem5/purple-mm-sms/-/archive/v$pkgver/purple-mm-sms-v$pkgver.tar.gz"
|
||||
#builddir="$srcdir/$pkgname-v$pkgver"
|
||||
builddir="$srcdir/$pkgname-$_commit"
|
||||
options="!check" # No test suite
|
||||
|
||||
build() {
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" make install
|
||||
}
|
||||
sha512sums="f65ac2c05af0d47d1273d984db1207b3dea5435341867c155ec0a9ddfeaf90e1ee55b87b67b48aa74cf7dcfa6ee7446cb05b8e0274818db45b23ad95a654ef98 purple-mm-sms-94d74f0b26fe953bc5f8be0fc7835876c94c6ae8.tar.gz"
|
||||
Reference in new issue
Block a user