[asterisk-dev] Patch from 1.4.17 to 1.4.18 is failing at ael_lex.c
Andre Courchesne - Prival
acourchesne at prival.ca
Tue Feb 12 10:33:12 CST 2008
BTW, it is failing in this hunk:
***************
*** 777,783 ****
* bison-bridge passes an additional yylval argument to ael_yylex().
* bison-locations is probably not needed.
*/
- #line 59 "ael.flex"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/types.h>
--- 791,797 ----
* bison-bridge passes an additional yylval argument to ael_yylex().
* bison-locations is probably not needed.
*/
+ #line 63 "ael.flex"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/types.h>
This is because of the following line:
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
Which shows in the source code as:
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 87168 $")
Andre Courchesne
Concepteur Logiciel - Software Developer
acourchesne at prival.ca
PrivalODC Inc.
9955 ave Catania, local 145
Brossard, QC
J4Z 3V5
Web.: http://www.prival.ca
Tel.: (450) 761-9973 poste 635
1-866-761-9973
Fax.: (450) 761-9842
Ce message électronique ainsi que tous les documents annexés s’adressent
exclusivement à la personne ou à l’entité inscrit dans la rubrique
destinataire ; il peut contenir des renseignements de nature confidentielle
ou privilégiée aux termes des lois applicables. Nulle autre personne ne doit
y avoir accès. Si vous n’êtes pas le destinataire convenu, nous vous avisons
par la présente qu'il est strictement interdit d'en divulguer le contenu, de
le distribuer, le copier ou l’ utiliser. Veuillez aviser l’expéditeur
immédiatement par retour de courrier électronique et supprimer ce message de
votre système. Toute diffusion ou reproduction de ce document ainsi que tout
mesure prise à l’égard de la présente est formellement interdite.
Merci de penser à l'environnement avant d'imprimer ce courriel.
Andre Courchesne - Prival wrote:
> Hi,
>
> Just a simple note that the patch available fails when trying to patch 1.4.17:
>
> [courchea at localhost asterisk-1.4.17]$ patch -p0 --dry-run <asterisk-1.4.18-patch
> patching file build_tools/make_version
> patching file build_tools/menuselect-deps.in
> patching file configure
> patching file pbx/pbx_kdeconsole.cc
> patching file pbx/pbx_kdeconsole.h
> patching file pbx/kdeconsole_main.cc
> patching file pbx/pbx_config.c
> patching file pbx/ael/ael_lex.c
> Hunk #5 FAILED at 791.
> 1 out of 32 hunks FAILED -- saving rejects to file pbx/ael/ael_lex.c.rej
> patching file pbx/ael/ael.flex
> patching file pbx/pbx_gtkconsole.c
> patching file pbx/Makefile
> patching file pbx/pbx_dundi.c
> patching file channels/misdn_config.c
> patching file channels/chan_misdn.c
> patching file channels/chan_h323.c
> patching file channels/chan_mgcp.c
> patching file channels/chan_local.c
> patching file channels/chan_zap.c
> patching file channels/chan_sip.c
> patching file channels/chan_agent.c
> patching file channels/chan_gtalk.c
> patching file channels/chan_iax2.c
> patching file configure.ac
> patching file apps/app_chanspy.c
> patching file apps/app_mixmonitor.c
> patching file apps/app_meetme.c
> patching file apps/app_macro.c
> patching file apps/app_voicemail.c
> patching file apps/app_dial.c
> Hunk #1 succeeded at 25 with fuzz 1.
> patching file apps/app_externalivr.c
> patching file apps/app_queue.c
> patching file apps/app_followme.c
> Hunk #1 succeeded at 28 with fuzz 1.
> patching file .version
> patching file doc/security.txt
> patching file Makefile
> patching file funcs/func_groupcount.c
> patching file include/asterisk/chanspy.h
> patching file include/asterisk/channel.h
> patching file include/asterisk/app.h
> patching file include/asterisk/res_odbc.h
> patching file include/asterisk/translate.h
> patching file include/asterisk/frame.h
> patching file include/asterisk/sched.h
> patching file include/asterisk/autoconfig.h.in
> patching file include/asterisk/audiohook.h
> patching file .lastclean
> patching file main/utils.c
> patching file main/cdr.c
> patching file main/channel.c
> patching file main/ast_expr2f.c
> patching file main/http.c
> patching file main/ast_expr2.fl
> patching file main/Makefile
> patching file main/slinfactory.c
> patching file main/translate.c
> patching file main/acl.c
> patching file main/rtp.c
> patching file main/abstract_jb.c
> patching file main/asterisk.c
> patching file main/autoservice.c
> patching file main/frame.c
> patching file main/devicestate.c
> patching file main/cli.c
> patching file main/dial.c
> patching file main/editline/readline.c
> patching file main/pbx.c
> patching file main/dnsmgr.c
> patching file main/file.c
> patching file main/audiohook.c
> patching file ChangeLog
> patching file configs/res_odbc.conf.sample
> patching file configs/zapata.conf.sample
> patching file configs/extensions.conf.sample
> patching file configs/modules.conf.sample
> patching file makeopts.in
> patching file res/res_jabber.c
> patching file res/res_monitor.c
> patching file res/res_smdi.c
> patching file res/res_agi.c
> patching file res/res_odbc.c
> patching file res/res_config_pgsql.c
> patching file res/res_features.c
> Hunk #1 succeeded at 23 with fuzz 1.
> patching file codecs/gsm/Makefile
> patching file codecs/codec_speex.c
> patching file codecs/codec_zap.c
> patching file .cleancount
>
> --
> Andre Courchesne
> Concepteur Logiciel - Software Developer
> acourchesne at prival.ca
>
> PrivalODC Inc.
> 9955 ave Catania, local 145
> Brossard, QC
> J4Z 3V5
>
> Web.: http://www.prival.ca
> Tel.: (450) 761-9973 poste 635
> 1-866-761-9973
> Fax.: (450) 761-9842
>
> Ce message électronique ainsi que tous les documents annexés s’adressent
> exclusivement à la personne ou à l’entité inscrit dans la rubrique
> destinataire ; il peut contenir des renseignements de nature confidentielle
> ou privilégiée aux termes des lois applicables. Nulle autre personne ne doit
> y avoir accès. Si vous n’êtes pas le destinataire convenu, nous vous avisons
> par la présente qu'il est strictement interdit d'en divulguer le contenu, de
> le distribuer, le copier ou l’ utiliser. Veuillez aviser l’expéditeur
> immédiatement par retour de courrier électronique et supprimer ce message de
> votre système. Toute diffusion ou reproduction de ce document ainsi que tout
> mesure prise à l’égard de la présente est formellement interdite.
>
> Merci de penser à l'environnement avant d'imprimer ce courriel.
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
>
> _______________________________________________
> --Bandwidth and Colocation Provided by http://www.api-digital.com--
>
> asterisk-dev mailing list
> To UNSUBSCRIBE or update options visit:
> http://lists.digium.com/mailman/listinfo/asterisk-dev
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
More information about the asterisk-dev
mailing list