Package: smssend Version: 3.4-2 Severity: normal Tags: patch User: [EMAIL PROTECTED] Usertags: origin-ubuntu hardy ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 In Ubuntu, we've applied the attached patch to achieve the following: * Add script for Danish Unotel. * Implement Charset modifier for input variables. We thought you might be interested in doing the same (and perhaps forward it upstream). - -- System Information: Debian Release: lenny/sid APT prefers hardy APT policy: (500, 'hardy'), (500, 'gutsy') Architecture: amd64 (x86_64) Kernel: Linux 2.6.24-2-generic (SMP w/2 CPU cores) Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFHfDDLonjfXui9pOMRAkn6AJwIuAF8hwzSM1KbWyM0jqW1GD+iXgCffSSD CUwDNRHnp4gSW2g3x0uCZok= =gGKX -----END PGP SIGNATURE-----
diff -u smssend-3.4/debian/changelog smssend-3.4/debian/changelog only in patch2: unchanged: --- smssend-3.4.orig/scripts/Makefile.am +++ smssend-3.4/scripts/Makefile.am @@ -2,6 +2,6 @@ AUTOMAKE_OPTIONS = no-dependencies dist-shar -pkgdata_DATA = 130sms.sms 1rstwap.sms 6sensreg.sms 6sens.sms a1_globalsms.sms amazonia.sms americel.sms armgsm.sms atl.sms attwireless.sms banana.sms basemine.sms bcp.sms bell.sms bol_rus.sms bol.sms boltblue.sms bramka.sms bwc.sms clarodigital.sms claro.sms clubmessage.sms comcel.sms coolsmsdk-fast.sms coolsmsdk.sms cosmos.sms cricket.sms ebol.sms e-merge.sms ems-iwarp.sms ermak_rus.sms etsity.sms eurobate.sms eurotel.sms everyday.sms exoset.sms extel-gsm.sms fajront.sms fido.sms freenet.sms freesmsau.sms ft.sms globtel.sms gmxde.sms goingtonight.sms golden.sms gomobile.sms gorizont-rt.sms gtnet.sms halebop.sms hooya.sms hotsms.sms indosat-m3.sms info2you.sms ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms o2-genie.sms oi.sms onelv. sms orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms vivo.sms vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms yab.sms +pkgdata_DATA = 130sms.sms 1rstwap.sms 6sensreg.sms 6sens.sms a1_globalsms.sms amazonia.sms americel.sms armgsm.sms atl.sms attwireless.sms banana.sms basemine.sms bcp.sms bell.sms bol_rus.sms bol.sms boltblue.sms bramka.sms bwc.sms clarodigital.sms claro.sms clubmessage.sms comcel.sms coolsmsdk-fast.sms coolsmsdk.sms cosmos.sms cricket.sms ebol.sms e-merge.sms ems-iwarp.sms ermak_rus.sms etsity.sms eurobate.sms eurotel.sms everyday.sms exoset.sms extel-gsm.sms fajront.sms fido.sms freenet.sms freesmsau.sms ft.sms globtel.sms gmxde.sms goingtonight.sms golden.sms gomobile.sms gorizont-rt.sms gtnet.sms halebop.sms hooya.sms hotsms.sms indosat-m3.sms info2you.sms ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms o2-genie.sms oi.sms onelv. sms orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms unotel.sms vivo.sms vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms yab.sms -EXTRA_DIST = 130sms.sms 1rstwap.sms 6sensreg.sms 6sens.sms a1_globalsms.sms amazonia.sms americel.sms armgsm.sms atl.sms attwireless.sms banana.sms basemine.sms bcp.sms bell.sms bol_rus.sms bol.sms boltblue.sms bramka.sms bwc.sms clarodigital.sms claro.sms clubmessage.sms comcel.sms coolsmsdk-fast.sms coolsmsdk.sms cosmos.sms cricket.sms ebol.sms e-merge.sms ems-iwarp.sms ermak_rus.sms etsity.sms eurobate.sms eurotel.sms everyday.sms exoset.sms extel-gsm.sms fajront.sms fido.sms freenet.sms freesmsau.sms ft.sms globtel.sms gmxde.sms goingtonight.sms golden.sms gomobile.sms gorizont-rt.sms gtnet.sms halebop.sms hooya.sms hotsms.sms indosat-m3.sms info2you.sms ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms o2-genie.sms oi.sms onelv.sm s orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms vivo.sms vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms yab.sms +EXTRA_DIST = 130sms.sms 1rstwap.sms 6sensreg.sms 6sens.sms a1_globalsms.sms amazonia.sms americel.sms armgsm.sms atl.sms attwireless.sms banana.sms basemine.sms bcp.sms bell.sms bol_rus.sms bol.sms boltblue.sms bramka.sms bwc.sms clarodigital.sms claro.sms clubmessage.sms comcel.sms coolsmsdk-fast.sms coolsmsdk.sms cosmos.sms cricket.sms ebol.sms e-merge.sms ems-iwarp.sms ermak_rus.sms etsity.sms eurobate.sms eurotel.sms everyday.sms exoset.sms extel-gsm.sms fajront.sms fido.sms freenet.sms freesmsau.sms ft.sms globtel.sms gmxde.sms goingtonight.sms golden.sms gomobile.sms gorizont-rt.sms gtnet.sms halebop.sms hooya.sms hotsms.sms indosat-m3.sms info2you.sms ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms o2-genie.sms oi.sms onelv.sm s orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms unotel.sms vivo.sms vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms yab.sms only in patch2: unchanged: --- smssend-3.4.orig/scripts/Makefile.in +++ smssend-3.4/scripts/Makefile.in @@ -135,9 +135,9 @@ AUTOMAKE_OPTIONS = no-dependencies dist-shar -pkgdata_DATA = 130sms.sms 1rstwap.sms 6sensreg.sms 6sens.sms a1_globalsms.sms amazonia.sms americel.sms armgsm.sms atl.sms attwireless.sms banana.sms basemine.sms bcp.sms bell.sms bol_rus.sms bol.sms boltblue.sms bramka.sms bwc.sms clarodigital.sms claro.sms clubmessage.sms comcel.sms coolsmsdk-fast.sms coolsmsdk.sms cosmos.sms cricket.sms ebol.sms e-merge.sms ems-iwarp.sms ermak_rus.sms etsity.sms eurobate.sms eurotel.sms everyday.sms exoset.sms extel-gsm.sms fajront.sms fido.sms freenet.sms freesmsau.sms ft.sms globtel.sms gmxde.sms goingtonight.sms golden.sms gomobile.sms gorizont-rt.sms gtnet.sms halebop.sms hooya.sms hotsms.sms indosat-m3.sms info2you.sms ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms o2-genie.sms oi.sms onelv. sms orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms vivo.sms vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms yab.sms +pkgdata_DATA = 130sms.sms 1rstwap.sms 6sensreg.sms 6sens.sms a1_globalsms.sms amazonia.sms americel.sms armgsm.sms atl.sms attwireless.sms banana.sms basemine.sms bcp.sms bell.sms bol_rus.sms bol.sms boltblue.sms bramka.sms bwc.sms clarodigital.sms claro.sms clubmessage.sms comcel.sms coolsmsdk-fast.sms coolsmsdk.sms cosmos.sms cricket.sms ebol.sms e-merge.sms ems-iwarp.sms ermak_rus.sms etsity.sms eurobate.sms eurotel.sms everyday.sms exoset.sms extel-gsm.sms fajront.sms fido.sms freenet.sms freesmsau.sms ft.sms globtel.sms gmxde.sms goingtonight.sms golden.sms gomobile.sms gorizont-rt.sms gtnet.sms halebop.sms hooya.sms hotsms.sms indosat-m3.sms info2you.sms ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms o2-genie.sms oi.sms onelv. sms orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms unotel.sms vivo.sms vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms yab.sms -EXTRA_DIST = 130sms.sms 1rstwap.sms 6sensreg.sms 6sens.sms a1_globalsms.sms amazonia.sms americel.sms armgsm.sms atl.sms attwireless.sms banana.sms basemine.sms bcp.sms bell.sms bol_rus.sms bol.sms boltblue.sms bramka.sms bwc.sms clarodigital.sms claro.sms clubmessage.sms comcel.sms coolsmsdk-fast.sms coolsmsdk.sms cosmos.sms cricket.sms ebol.sms e-merge.sms ems-iwarp.sms ermak_rus.sms etsity.sms eurobate.sms eurotel.sms everyday.sms exoset.sms extel-gsm.sms fajront.sms fido.sms freenet.sms freesmsau.sms ft.sms globtel.sms gmxde.sms goingtonight.sms golden.sms gomobile.sms gorizont-rt.sms gtnet.sms halebop.sms hooya.sms hotsms.sms indosat-m3.sms info2you.sms ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms o2-genie.sms oi.sms onelv.sm s orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms vivo.sms vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms yab.sms +EXTRA_DIST = 130sms.sms 1rstwap.sms 6sensreg.sms 6sens.sms a1_globalsms.sms amazonia.sms americel.sms armgsm.sms atl.sms attwireless.sms banana.sms basemine.sms bcp.sms bell.sms bol_rus.sms bol.sms boltblue.sms bramka.sms bwc.sms clarodigital.sms claro.sms clubmessage.sms comcel.sms coolsmsdk-fast.sms coolsmsdk.sms cosmos.sms cricket.sms ebol.sms e-merge.sms ems-iwarp.sms ermak_rus.sms etsity.sms eurobate.sms eurotel.sms everyday.sms exoset.sms extel-gsm.sms fajront.sms fido.sms freenet.sms freesmsau.sms ft.sms globtel.sms gmxde.sms goingtonight.sms golden.sms gomobile.sms gorizont-rt.sms gtnet.sms halebop.sms hooya.sms hotsms.sms indosat-m3.sms info2you.sms ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms o2-genie.sms oi.sms onelv.sm s orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms unotel.sms vivo.sms vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms yab.sms subdir = scripts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs only in patch2: unchanged: --- smssend-3.4.orig/scripts/unotel.sms +++ smssend-3.4/scripts/unotel.sms @@ -0,0 +1,31 @@ +# Unotel (Denmark) - www.unotel.dk +# Version 0.9 +# by Soren Hansen <[EMAIL PROTECTED]> +# +# Error codes: +# 1: Login failed +# +# Usage: +# smssend unotel PHONENO PASSWORD RECIPIENT MESSAGE +# + +NbParams 4 +%Phone : Your phone number (omit +45) +%Password Hidden : Your password (for www.unotel.dk) +%Dest Size=8 : Recipient (8 digits) +%Message Size=1200 Convert Charset-latin1 : Your message + +# Log in +PostURL https://www.unotel.dk/nykundelogin/login.asp +PostData brugernavn=\%Phone%&adgangskode=\%Password%&submit1=%A0%A0login%A0%A0 +Search Vi kunne ikke finde nogen kunde +ErrorMsg 1 Login failed. +GO + +# Needed to get the special sender id (afsender) +GetURL https://www.unotel.dk/nykundelogin/websms.asp +GO + +PostURL https://www.unotel.dk/nykundelogin/websms.asp?check= +PostData afsender=\%RTRegex-4-1-1-input name="afsender" type="hidden" id="afsender" value="([0-9]+)"%&modtager=\%Dest%&tekst=\%Message%&tegn=160&tegn_max=160&sms=1&sendsms=Send%20SMS +Go only in patch2: unchanged: --- smssend-3.4.orig/smssend.h.in +++ smssend-3.4/smssend.h.in @@ -68,6 +68,7 @@ int Hidden; int Size; int Convert; + char *DestCharset; } SMS_TParam, *SMS_PParam; typedef struct only in patch2: unchanged: --- smssend-3.4.orig/smssend.c +++ smssend-3.4/smssend.c @@ -27,6 +27,7 @@ * -9 -> 404 from server * -10 -> Option not supported * -11 -> Unknown reply + * -12 -> Error during iconv */ #ifndef _CONSOLE @@ -51,6 +52,10 @@ #define __unix__ #endif /* _CONSOLE */ +#include <iconv.h> +#include <locale.h> +#include <langinfo.h> + #ifdef USE_PCRE static int PM_GetRegexMatch(char *data, char*regex, int gpos, int pos, char *buf, int blen); #endif /* USE_PCRE */ @@ -720,6 +725,8 @@ Pv->Params[NbParams].Hidden = 1; else if(strcasecmp(Str,"Convert") == 0) Pv->Params[NbParams].Convert = 1; + else if(strncasecmp(Str,"Charset-",8) == 0) + Pv->Params[NbParams].DestCharset = strdup(Str+8); else if(strncasecmp(Str,"Size",4) == 0) Pv->Params[NbParams].Size = atoi(Str+5); else if(Str[0] == ':') @@ -1631,6 +1638,34 @@ else SU_strcpy(tbuf,Pv->Params[found].Value,sizeof(tbuf)); + if(Pv->Params[found].DestCharset) { + char convbuf[1024], *convptr, *tptr; + size_t insize, outsize; + iconv_t cd; + /* skyutils is not locale safe (parses the HTTP version code as a float, but + * but not all locales use . as a decimal separator) */ + char *codeset = nl_langinfo(CODESET); + setlocale(LC_ALL, ""); + + convptr = convbuf; + tptr = tbuf; + insize = strlen(tbuf) + 1; + outsize = sizeof(convbuf); + if ((cd = iconv_open(Pv->Params[found].DestCharset, "")) == (iconv_t) -1) { + perror("iconv_open"); + exit(-12); + } + if (iconv(cd, &tptr, &insize, &convptr, &outsize) == (size_t) -1) { + perror("iconv"); + exit(-12); + } + if (iconv_close(cd) == -1) { + perror("iconv_close"); + exit(-12); + } + setlocale(LC_ALL, codeset); + strcpy(tbuf, convbuf); + } if(Pv->Params[found].Convert || (Pv->Params[found].Size != 0)) str = CheckMessage(tbuf,(Pv->Params[found].Size == 0)?512:Pv->Params[found].Size); else
